From 736d5e2911e660b875ba905b50a410ad5c66d68b Mon Sep 17 00:00:00 2001 From: Steven Scott Date: Sun, 21 Dec 2025 00:37:33 -0500 Subject: [PATCH 001/232] fix output of `zcli list-gens` --- modules/home/scripts/zcli.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 243dcdb..d905fb6 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -382,10 +382,10 @@ in ;; list-gens) echo "--- User Generations ---" - ${pkgs.nix}/bin/nix-env --list-generations | ${pkgs.coreutils}/bin/cat || echo "Could not list user generations." + ${pkgs.nix}/bin/nix-env --list-generations || echo "Could not list user generations." echo "" echo "--- System Generations ---" - ${pkgs.nix}/bin/nix profile history --profile /nix/var/nix/profiles/system | ${pkgs.coreutils}/bin/cat || echo "Could not list system generations." + ${pkgs.nix}/bin/nix profile history --profile /nix/var/nix/profiles/system || echo "Could not list system generations." ;; rebuild) verify_hostname From 9bc44bb149a0af62726d45386a30747ebfbcea35 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 21 Dec 2025 00:43:38 -0500 Subject: [PATCH 002/232] Merging zos-next to main -- zcli fix --- modules/home/scripts/zcli.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 243dcdb..d905fb6 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -382,10 +382,10 @@ in ;; list-gens) echo "--- User Generations ---" - ${pkgs.nix}/bin/nix-env --list-generations | ${pkgs.coreutils}/bin/cat || echo "Could not list user generations." + ${pkgs.nix}/bin/nix-env --list-generations || echo "Could not list user generations." echo "" echo "--- System Generations ---" - ${pkgs.nix}/bin/nix profile history --profile /nix/var/nix/profiles/system | ${pkgs.coreutils}/bin/cat || echo "Could not list system generations." + ${pkgs.nix}/bin/nix profile history --profile /nix/var/nix/profiles/system || echo "Could not list system generations." ;; rebuild) verify_hostname From 62662055085256ac80a0c9ff6ef1e6aad9b291af Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 21 Dec 2025 00:47:35 -0500 Subject: [PATCH 003/232] Updated CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9915a84..b8b429e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** +#### 📅 **Updated: December 21th, 2025** + +- Fixed: + - Output of `zcli list-gens` corrected + - Thanks `@codingismy11to71` + #### 📅 **Updated: December 14th, 2025** - Fixed: From 248f497ae02f36393ec43adb86c7f64ca7fc3250 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 21 Dec 2025 09:01:36 -0500 Subject: [PATCH 004/232] Changed nixvim to blink-cmp --- CHANGELOG.md | 8 +++- flake.lock | 6 +-- modules/core/packages.nix | 4 +- modules/home/editors/nixvim.nix | 74 +++++++++++++-------------------- 4 files changed, 41 insertions(+), 51 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8b429e..46226bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,13 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** -#### 📅 **Updated: December 21th, 2025** +#### 📅 **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` - Fixed: - Output of `zcli list-gens` corrected diff --git a/flake.lock b/flake.lock index 1392c2c..783b1a3 100644 --- a/flake.lock +++ b/flake.lock @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1765939407, - "narHash": "sha256-7wlCANcMdIBNsAz0LGF/IBwkjicxCbCN1K2lrwt/MFk=", + "lastModified": 1766324023, + "narHash": "sha256-5nyNV3X2W7AjY9ZJzVlN8Y7uV+S9yIE1TBNb4JFDG/w=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "c74139c51dbdd47b8123c7186a8af613b840f493", + "rev": "4a666591fad226e2217db715020d0ec384cdd4a3", "type": "github" }, "original": { diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 7710737..9bea5c2 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -12,6 +12,7 @@ with pkgs; [ matugen # color palette generator needed for noctalia-shell app2unit # launcher for noctalia-shell + gpu-screen-recorder # needed for nnoctalia-shell ] else []; in { @@ -58,8 +59,6 @@ in { eza # Beautiful ls Replacement ffmpeg # Terminal Video / Audio Editing file-roller # Archive Manager - gedit # Simple Graphical Text Editor - gemini-cli # CLI AI client ONLY (optional) gimp # Great Photo Editor gpu-screen-recorder # needed for nnoctalia-shell power-profiles-daemon # needed for noctalia-shell power cycle @@ -97,7 +96,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 diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 68a4798..369bca9 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -124,14 +124,38 @@ markdown-preview.enable = true; # Completion and snippets - cmp = { + blink-cmp = { enable = true; + settings = { + keymap = { + preset = "default"; + "" = ["accept" "fallback"]; + "" = ["select_next" "fallback"]; + "" = ["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; @@ -361,44 +385,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({ - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.confirm({ select = true }), - [""] = cmp.mapping.select_next_item(), - [""] = 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 From 81e3414421121fda4a7080ff0d41b35a6826d8f0 Mon Sep 17 00:00:00 2001 From: Steven Scott Date: Mon, 22 Dec 2025 10:42:17 -0500 Subject: [PATCH 005/232] refactor variables.nix files with comments to an options module --- CHANGELOG.md | 9 + WARP.md | 2 + flake.nix | 32 +-- hosts/default/default.nix | 1 + hosts/default/variables.nix | 186 +++++--------- hosts/nixstation/default.nix | 1 + hosts/nixstation/variables.nix | 199 +++++++------- hosts/zaneyos-24-vm/default.nix | 1 + hosts/zaneyos-24-vm/variables.nix | 243 ++++++++++-------- hosts/zaneyos-oem/default.nix | 1 + hosts/zaneyos-oem/variables.nix | 201 ++++++++------- modules/core/default.nix | 19 +- modules/core/hardware.nix | 10 +- modules/core/ly.nix | 10 +- modules/core/network.nix | 8 +- modules/core/nfs.nix | 5 +- modules/core/packages.nix | 5 +- modules/core/printing.nix | 6 +- modules/core/sddm.nix | 53 ++-- modules/core/services.nix | 9 +- modules/core/stylix.nix | 5 +- modules/core/system.nix | 9 +- modules/core/thunar.nix | 5 +- modules/core/user.nix | 15 +- modules/core/xserver.nix | 8 +- modules/home/bash.nix | 4 +- modules/home/cli/git.nix | 5 +- modules/home/default.nix | 7 +- .../home/hyprland/animations-end-slide.nix | 6 +- .../home/hyprland/animations-end4-slide.nix | 6 +- .../hyprland/animations-hyde-optimized.nix | 6 +- .../hyprland/animations-mahaveer-me-1.nix | 6 +- .../hyprland/animations-mahaveer-me-2.nix | 6 +- .../home/hyprland/animations-ml4w-classic.nix | 6 +- .../home/hyprland/animations-ml4w-fast.nix | 6 +- .../home/hyprland/animations-ml4w-high.nix | 6 +- modules/home/hyprland/binds.nix | 6 +- modules/home/hyprland/default.nix | 5 +- modules/home/hyprland/exec-once.nix | 10 +- modules/home/hyprland/hyprland.nix | 12 +- modules/home/hyprland/windowrules.nix | 7 +- modules/home/scripts/default.nix | 5 +- modules/home/scripts/zcli.nix | 4 +- modules/home/waybar/waybar-TheBlackDon.nix | 7 +- modules/home/waybar/waybar-curved.nix | 6 +- modules/home/waybar/waybar-ddubs.nix | 2 +- modules/home/waybar/waybar-ddubsos-v1.nix | 3 +- modules/home/waybar/waybar-nekodyke.nix | 4 +- modules/home/waybar/waybar-simple.nix | 3 +- modules/home/waybar/waybar-tony.nix | 3 - modules/home/zsh/default.nix | 6 +- modules/options.nix | 234 +++++++++++++++++ profiles/amd-hybrid/default.nix | 42 ++- profiles/amd/default.nix | 27 +- profiles/default.nix | 10 + profiles/intel/default.nix | 27 +- profiles/nvidia-laptop/default.nix | 35 ++- profiles/nvidia/default.nix | 27 +- profiles/vm/default.nix | 27 +- 59 files changed, 908 insertions(+), 711 deletions(-) create mode 100644 modules/options.nix create mode 100644 profiles/default.nix diff --git a/CHANGELOG.md b/CHANGELOG.md index 9915a84..903d1dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,15 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** +#### 📅 **Updated: December 20th, 2025** + +- Refactored: + - Introduced `modules/options.nix` as a central location for `zaneyos` option definitions. + - Updated `flake.nix` to import `modules/core` directly. +- Documentation: + - Updated `README.md`, `WARP.md`, `FAQ.md`, and `cheatsheets/project-guide.md` to reflect the new structure. + - Updated Spanish documentation (`README.es.md`, `FAQ.es.md`, etc.). + #### 📅 **Updated: December 14th, 2025** - Fixed: diff --git a/WARP.md b/WARP.md index abdb5a9..8e69544 100644 --- a/WARP.md +++ b/WARP.md @@ -54,6 +54,8 @@ High-level architecture (big picture) - hosts// - 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). diff --git a/flake.nix b/flake.nix index 9e45345..946e66e 100644 --- a/flake.nix +++ b/flake.nix @@ -47,35 +47,37 @@ ... } @ inputs: let system = "x86_64-linux"; - host = "zaneyos-24-vm"; - profile = "vm"; username = "dwilliams"; # Deduplicate nixosConfigurations while preserving the top-level 'profile' - mkNixosConfig = gpuProfile: + mkNixosConfig = host: nixpkgs.lib.nixosSystem { inherit system; specialArgs = { inherit inputs; inherit username; - inherit host; - inherit profile; # keep using the let-bound profile for modules/scripts }; modules = [ - ./modules/core/overlays.nix - ./profiles/${gpuProfile} + ./modules/core + ./modules/drivers nix-flatpak.nixosModules.nix-flatpak + ./hosts/${host} + ./profiles ]; }; + + hosts = [ + "default" + "nixstation" + "zaneyos-24-vm" + "zaneyos-oem" + ]; in { - nixosConfigurations = { - amd = mkNixosConfig "amd"; - nvidia = mkNixosConfig "nvidia"; - nvidia-laptop = mkNixosConfig "nvidia-laptop"; - amd-hybrid = mkNixosConfig "amd-hybrid"; - intel = mkNixosConfig "intel"; - vm = mkNixosConfig "vm"; - }; + nixosConfigurations = builtins.listToAttrs (map (host: { + name = host; + value = mkNixosConfig host; + }) + hosts); formatter.x86_64-linux = inputs.alejandra.packages.x86_64-linux.default; }; diff --git a/hosts/default/default.nix b/hosts/default/default.nix index 6faad47..bdd5f44 100644 --- a/hosts/default/default.nix +++ b/hosts/default/default.nix @@ -2,5 +2,6 @@ imports = [ ./hardware.nix ./host-packages.nix + ./variables.nix ]; } diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index d047a08..563e615 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -1,133 +1,79 @@ -{ - # Git Configuration ( For Pulling Software Repos ) - gitUsername = "Tyler Kelley"; - gitEmail = "tylerzanekelley@gmail.com"; +_: { + # Welcome to your ZaneyOS configuration! + # This block is where you can customize your NixOS experience. + # + # For a comprehensive list of all available options, their descriptions, + # and default values, please refer to the following file: + # ../../modules/options.nix + # + # You can override any of those options here. Most settings are optional + # and can be removed to use the project defaults. + zaneyos = { + # Git Configuration + gitUsername = "Tyler Kelley"; + gitEmail = "tylerzanekelley@gmail.com"; - # Set Displau Manager - # `tui` for Text login - # `sddm` for graphical GUI (default) - # SDDM background is set with stylixImage - displayManager = "sddm"; + # does not have to be the same as the directory name, but + # would be common + hostName = "my-hostname"; - # Emable/disable bundled applications - tmuxEnable = false; - alacrittyEnable = false; - weztermEnable = false; - ghosttyEnable = false; - vscodeEnable = false; - antigravityEnable = false; # Google port of vscodium - # Note: This is evil-helix with VIM keybindings by default - helixEnable = false; - #To install: Enable here, zcli rebuild, then run zcli doom install - doomEmacsEnable = false; + gpuProfile = "vm"; - # Python development tools are included by default + # Set Display Manager + # `tui` for Text login + # `sddm` for graphical GUI (default) + # SDDM background is set with stylixImage + displayManager = "sddm"; - # Hyprland Settings - # Examples: - # extraMonitorSettings = "monitor = Virtual-1,1920x1080@60,auto,1"; - # extraMonitorSettings = "monitor = HDMI-A-1,1920x1080@60,auto,1"; - # You can configure multiple monitors. - # Inside the quotes, create a new line for each monitor. - extraMonitorSettings = " + # Emable/disable bundled applications + tmuxEnable = false; + alacrittyEnable = false; + weztermEnable = false; + ghosttyEnable = false; + vscodeEnable = false; + antigravityEnable = false; # Google port of vscodium + # Note: This is evil-helix with VIM keybindings by default + helixEnable = false; + #To install: Enable here, zcli rebuild, then run zcli doom install + doomEmacsEnable = false; - "; + # 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"; + # 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"; + # 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; - # For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA) - intelID = "PCI:1:0:0"; - amdgpuID = "PCI:5:0:0"; - nvidiaID = "PCI:0:2:0"; + # Set Waybar + # Available Options: + waybarChoice = ../../modules/home/waybar/waybar-curved.nix; - # Enable NFS - enableNFS = true; - - # Enable Printing Support - printEnable = false; - - # Enable Thunar GUI File Manager - # Yazi is default File Manager - thunarEnable = false; - - # Themes, waybar and animation. - # Only uncomment your selection - # The others much be commented out. - - # Set Stylix Image - # This will set your color palette - # Default background - # Add new images to ~/zaneyos/wallpapers - stylixImage = ../../wallpapers/mountainscapedark.jpg; - #stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; - #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; - #stylixImage = ../../wallpapers/Rainnight.jpg; - #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; - #stylixImage = ../../wallpapers/nix-wallpaper-stripes-logo.png; - #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; - - # Set Waybar - # Available Options: - waybarChoice = ../../modules/home/waybar/waybar-curved.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix; - #waybarChoice = ../../modules/home/waybar/waybar-simple.nix; - #waybarChoice = ../../modules/home/waybar/waybar-dwm.nix; - #waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix; - #waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jerry.nix; - #waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix; - #waybarChoice = ../../modules/home/waybar/waybar-tony.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix; - #waybarChoice = ../../modules/home/waybar/waybar-mecha.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix; - #waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix; - - # Set Animation style - # Available options are: - animChoice = ../../modules/home/hyprland/animations-def.nix; - #animChoice = ../../modules/home/hyprland/animations-end4.nix; - #animChoice = ../../modules/home/hyprland/animations-end4-slide.nix; - #animChoice = ../../modules/home/hyprland/animations-end-slide.nix; - #animChoice = ../../modules/home/hyprland/animations-dynamic.nix; - #animChoice = ../../modules/home/hyprland/animations-moving.nix; - #animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix; - #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix; - #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix; - - # Set network hostId if required (needed for zfs) - # Otherwise leave as-is - hostId = "5ab03f50"; + # Set Animation style + # Available options are: + animChoice = ../../modules/home/hyprland/animations-def.nix; + }; } diff --git a/hosts/nixstation/default.nix b/hosts/nixstation/default.nix index 6faad47..bdd5f44 100644 --- a/hosts/nixstation/default.nix +++ b/hosts/nixstation/default.nix @@ -2,5 +2,6 @@ imports = [ ./hardware.nix ./host-packages.nix + ./variables.nix ]; } diff --git a/hosts/nixstation/variables.nix b/hosts/nixstation/variables.nix index f3f01b6..df62f78 100644 --- a/hosts/nixstation/variables.nix +++ b/hosts/nixstation/variables.nix @@ -1,112 +1,119 @@ -{ - # Git Configuration ( For Pulling Software Repos ) - gitUsername = "Tyler Kelly"; - gitEmail = "tylerzanekelly@gmail.com"; +_: { + # Welcome to your ZaneyOS configuration! + # This block is where you can customize your NixOS experience. + # + # For a comprehensive list of all available options, their descriptions, + # and default values, please refer to the following file: + # ../../modules/options.nix + # + # You can override any of those options here. Most settings are optional + # and can be removed to use the project defaults. + zaneyos = { + # Git Configuration ( For Pulling Software Repos ) + gitUsername = "Tyler Kelly"; + gitEmail = "tylerzanekelly@gmail.com"; - # Set Displau Manager - # `tui` for Text login - # `sddm` for graphical GUI - # SDDM background is set with stylixImage - displayManager = "sddm"; + gpuProfile = "vm"; - # Emable/disable bundled applications - tmuxEnable = false; - alacrittyEnable = false; - weztermEnable = false; - ghosttyEnable = false; - vscodeEnable = false; - antigravityEnable = false; # Google port of vscodium - helixEnable = false; - #To install rebuild, then run zcli doom install - doomEmacsEnable = false; + # Set Displau Manager + # `tui` for Text login + # `sddm` for graphical GUI + # SDDM background is set with stylixImage + displayManager = "sddm"; - # Python development tools - pythonEnable = false; + # Emable/disable bundled applications + tmuxEnable = false; + alacrittyEnable = false; + weztermEnable = false; + ghosttyEnable = false; + vscodeEnable = false; + antigravityEnable = false; # Google port of vscodium + helixEnable = false; + #To install rebuild, then run zcli doom install + doomEmacsEnable = false; - # P10K or starship prompt - userPrompt = "starship"; + # Hyprland Settings + extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1"; - # Hyprland Settings - extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1"; + # Bar/Shell Settings + # Choose between noctalia or waybar + barChoice = "noctalia"; - # Bar/Shell Settings - # Choose between noctalia or waybar - barChoice = "noctalia"; + # Waybar Settings (used when barChoice = "waybar") + clock24h = false; - # Waybar Settings (used when barChoice = "waybar") - clock24h = false; + # Program Options + browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) + terminal = "kitty"; # Set Default System Terminal + keyboardLayout = "us"; + consoleKeyMap = "us"; - # Program Options - browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) - terminal = "kitty"; # Set Default System Terminal - keyboardLayout = "us"; - consoleKeyMap = "us"; + # For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA) + intelID = "PCI:1:0:0"; + amdgpuID = "PCI:5:0:0"; + nvidiaID = "PCI:0:2:0"; - # For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA) - intelID = "PCI:1:0:0"; - amdgpuID = "PCI:5:0:0"; - nvidiaID = "PCI:0:2:0"; + # Enable NFS + enableNFS = true; - # Enable NFS - enableNFS = true; + # Enable Printing Support + printEnable = false; - # Enable Printing Support - printEnable = false; + # Enable Thunar GUI File Manager + thunarEnable = true; - # Enable Thunar GUI File Manager - thunarEnable = true; + # Set Stylix Image + # This will set your color palette + # Default background + # Add new images to ~/zaneyos/wallpapers + #stylixImage = ../../wallpapers/mountainscapedark.jpg; + stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; + #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; + #stylixImage = ../../wallpapers/Rainnight.jpg; + #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; + #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg; + #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; - # Set Stylix Image - # This will set your color palette - # Default background - # Add new images to ~/zaneyos/wallpapers - #stylixImage = ../../wallpapers/mountainscapedark.jpg; - stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; - #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; - #stylixImage = ../../wallpapers/Rainnight.jpg; - #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; - #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg; - #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; + # Set Waybar + # Available options: + waybarChoice = ../../modules/home/waybar/waybar-curved.nix; + #waybarChoice = ../../modules/home/waybar/waybar-simple.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jerry.nix; + #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; + #waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix; + #waybarChoice = ../../modules/home/waybar/waybar-dwm.nix; + #waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix; + #waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix; + #waybarChoice = ../../modules/home/waybar/waybar-tony.nix; + #waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix; + #waybarChoice = ../../modules/home/waybar/waybar-mecha.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix; + #waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix; + #waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix; + #waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix; - # Set Waybar - # Available options: - waybarChoice = ../../modules/home/waybar/waybar-curved.nix; - #waybarChoice = ../../modules/home/waybar/waybar-simple.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jerry.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix; - #waybarChoice = ../../modules/home/waybar/waybar-dwm.nix; - #waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix; - #waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix; - #waybarChoice = ../../modules/home/waybar/waybar-tony.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix; - #waybarChoice = ../../modules/home/waybar/waybar-mecha.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix; - #waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix; + # Set Animation style + # Available options are: + animChoice = ../../modules/home/hyprland/animations-end4.nix; + #animChoice = ../../modules/home/hyprland/animations-def.nix; + #animChoice = ../../modules/home/hyprland/animations-end4-slide.nix; + #animChoice = ../../modules/home/hyprland/animations-end-slide.nix; + #animChoice = ../../modules/home/hyprland/animations-dynamic.nix; + #animChoice = ../../modules/home/hyprland/animations-moving.nix; + #animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix; + #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix; + #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix; + #animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix; + #animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix; + #animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix; - # Set Animation style - # Available options are: - animChoice = ../../modules/home/hyprland/animations-end4.nix; - #animChoice = ../../modules/home/hyprland/animations-def.nix; - #animChoice = ../../modules/home/hyprland/animations-end4-slide.nix; - #animChoice = ../../modules/home/hyprland/animations-end-slide.nix; - #animChoice = ../../modules/home/hyprland/animations-dynamic.nix; - #animChoice = ../../modules/home/hyprland/animations-moving.nix; - #animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix; - #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix; - #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix; - - # Set network hostId if required (needed for zfs) - # Otherwise leave as-is - hostId = "5ab03f50"; + # Set network hostId if required (needed for zfs) + # Otherwise leave as-is + hostId = "5ab03f50"; + }; } diff --git a/hosts/zaneyos-24-vm/default.nix b/hosts/zaneyos-24-vm/default.nix index 6faad47..bdd5f44 100644 --- a/hosts/zaneyos-24-vm/default.nix +++ b/hosts/zaneyos-24-vm/default.nix @@ -2,5 +2,6 @@ imports = [ ./hardware.nix ./host-packages.nix + ./variables.nix ]; } diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix index 34a3ce3..14f354d 100644 --- a/hosts/zaneyos-24-vm/variables.nix +++ b/hosts/zaneyos-24-vm/variables.nix @@ -1,134 +1,151 @@ -{ - # Git Configuration ( For Pulling Software Repos ) - gitUsername = "dwilliams"; - gitEmail = "don.e.williams@gmail.com"; +_: { + # Welcome to your ZaneyOS configuration! + # This block is where you can customize your NixOS experience. + # + # For a comprehensive list of all available options, their descriptions, + # and default values, please refer to the following file: + # ../../modules/options.nix + # + # You can override any of those options here. Most settings are optional + # and can be removed to use the project defaults. + zaneyos = { + # Git Configuration ( For Pulling Software Repos ) + gitUsername = "dwilliams"; + gitEmail = "don.e.williams@gmail.com"; - # Set Displau Manager - # `tui` for Text login - # `sddm` for graphical GUI (default) - # SDDM background is set with stylixImage - displayManager = "tui"; + hostName = "zaneyos-24-vm"; - # Emable/disable bundled applications - tmuxEnable = true; - alacrittyEnable = true; - weztermEnable = true; - ghosttyEnable = true; - vscodeEnable = true; - antigravityEnable = true; # Google port of vscodium - # Note: This is evil-helix with VIM keybindings by default - helixEnable = true; - #To install: Enable here, zcli rebuild, then run zcli doom install - doomEmacsEnable = true; + enableSmartD = false; - # Python development tools - pythonEnable = true; + gpuProfile = "vm"; - # Hyprland Settings - # Examples: - # extraMonitorSettings = "monitor = Virtual-1,1920x1080@60,auto,1"; - # extraMonitorSettings = "monitor = HDMI-A-1,1920x1080@60,auto,1"; - # You can configure multiple monitors. - # Inside the quotes, create a new line for each monitor. - extraMonitorSettings = " + # Set Displau Manager + # `tui` for Text login + # `sddm` for graphical GUI (default) + # SDDM background is set with stylixImage + displayManager = "tui"; + + # Emable/disable bundled applications + tmuxEnable = true; + alacrittyEnable = true; + weztermEnable = true; + ghosttyEnable = true; + vscodeEnable = true; + antigravityEnable = true; # Google port of vscodium + # Note: This is evil-helix with VIM keybindings by default + helixEnable = true; + #To install: Enable here, zcli rebuild, then run zcli doom install + doomEmacsEnable = true; + + # Python development tools + pythonEnable = true; + + # Hyprland Settings + # Examples: + # extraMonitorSettings = "monitor = Virtual-1,1920x1080@60,auto,1"; + # extraMonitorSettings = "monitor = HDMI-A-1,1920x1080@60,auto,1"; + # You can configure multiple monitors. + # Inside the quotes, create a new line for each monitor. + extraMonitorSettings = " "; - # Bar/Shell Settings - # Choose between noctalia or waybar - barChoice = "waybar"; + # Bar/Shell Settings + # Choose between noctalia or waybar + barChoice = "waybar"; - # Waybar Settings (used when barChoice = "waybar") - clock24h = false; + # Waybar Settings (used when barChoice = "waybar") + clock24h = false; - # Program Options - # Set Default Browser (google-chrome-stable for google-chrome) - # This does NOT install your browser - # You need to install it by adding it to the `packages.nix` - # or as a flatpak - browser = "brave"; + # Program Options + # Set Default Browser (google-chrome-stable for google-chrome) + # This does NOT install your browser + # You need to install it by adding it to the `packages.nix` + # or as a flatpak + browser = "brave"; - # Available Options: - # Kitty, ghostty, wezterm, aalacrity - # Note: kitty, wezterm, alacritty have to be enabled in `variables.nix` - # Setting it here does not enable it. Kitty is installed by default - terminal = "kitty"; # Set Default System Terminal + # 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"; + }; } diff --git a/hosts/zaneyos-oem/default.nix b/hosts/zaneyos-oem/default.nix index 6faad47..bdd5f44 100644 --- a/hosts/zaneyos-oem/default.nix +++ b/hosts/zaneyos-oem/default.nix @@ -2,5 +2,6 @@ imports = [ ./hardware.nix ./host-packages.nix + ./variables.nix ]; } diff --git a/hosts/zaneyos-oem/variables.nix b/hosts/zaneyos-oem/variables.nix index 3412fcf..3ae3bcd 100644 --- a/hosts/zaneyos-oem/variables.nix +++ b/hosts/zaneyos-oem/variables.nix @@ -1,113 +1,120 @@ -{ - # Git Configuration ( For Pulling Software Repos ) - gitUsername = "Don Williams"; - gitEmail = "don.e.williams@gmail.com"; +_: { + # Welcome to your ZaneyOS configuration! + # This block is where you can customize your NixOS experience. + # + # For a comprehensive list of all available options, their descriptions, + # and default values, please refer to the following file: + # ../../modules/options.nix + # + # You can override any of those options here. Most settings are optional + # and can be removed to use the project defaults. + zaneyos = { + # Git Configuration ( For Pulling Software Repos ) + gitUsername = "Don Williams"; + gitEmail = "don.e.williams@gmail.com"; - # Set Displau Manager - # `tui` for Text login - # `sddm` for graphical GUI - # SDDM background is set with stylixImage - displayManager = "sddm"; + gpuProfile = "vm"; - # Emable/disable bundled applications - tmuxEnable = true; - alacrittyEnable = true; - weztermEnable = true; - ghosttyEnable = true; - vscodeEnable = true; - antigravityEnable = false; # Google port of vscodium - helixEnable = true; - #To install rebuild, then run zcli doom install - doomEmacsEnable = false; + # Set Displau Manager + # `tui` for Text login + # `sddm` for graphical GUI + # SDDM background is set with stylixImage + displayManager = "sddm"; - # Python development tools - pythonEnable = false; + # Emable/disable bundled applications + tmuxEnable = true; + alacrittyEnable = true; + weztermEnable = true; + ghosttyEnable = true; + vscodeEnable = true; + antigravityEnable = false; # Google port of vscodium + helixEnable = true; + #To install rebuild, then run zcli doom install + doomEmacsEnable = false; - # P10K or starship prompt - userPrompt = "starship"; + # Hyprland Settings + extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1"; - # Hyprland Settings - extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1"; + # Bar/Shell Settings + # Choose between noctalia or waybar + barChoice = "noctalia"; - # Bar/Shell Settings - # Choose between noctalia or waybar - barChoice = "noctalia"; + # Waybar Settings (used when barChoice = "waybar") + clock24h = false; - # Waybar Settings (used when barChoice = "waybar") - clock24h = false; + # Program Options + browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) + terminal = "kitty"; # Set Default System Terminal + keyboardLayout = "us"; + keyboardVariant = ""; + consoleKeyMap = "us"; - # Program Options - browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) - terminal = "kitty"; # Set Default System Terminal - keyboardLayout = "us"; - keyboardVariant = ""; - consoleKeyMap = "us"; + # For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA) + intelID = "PCI:1:0:0"; + amdgpuID = "PCI:5:0:0"; + nvidiaID = "PCI:0:2:0"; - # For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA) - intelID = "PCI:1:0:0"; - amdgpuID = "PCI:5:0:0"; - nvidiaID = "PCI:0:2:0"; + # Enable NFS + enableNFS = true; - # Enable NFS - enableNFS = true; + # Enable Printing Support + printEnable = false; - # Enable Printing Support - printEnable = false; + # Enable Thunar GUI File Manager + thunarEnable = true; - # Enable Thunar GUI File Manager - thunarEnable = true; + # Set Stylix Image + # This will set your color palette + # Default background + # Add new images to ~/zaneyos/wallpapers + stylixImage = ../../wallpapers/mountainscapedark.jpg; + #stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; + #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; + #stylixImage = ../../wallpapers/Rainnight.jpg; + #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; + #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg; + #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; - # Set Stylix Image - # This will set your color palette - # Default background - # Add new images to ~/zaneyos/wallpapers - stylixImage = ../../wallpapers/mountainscapedark.jpg; - #stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; - #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; - #stylixImage = ../../wallpapers/Rainnight.jpg; - #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; - #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg; - #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; + # Set Waybar + # Available options: + waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix; + #waybarChoice = ../../modules/home/waybar/waybar-simple.nix; + #waybarChoice = ../../modules/home/waybar/waybar-curved.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jerry.nix; + #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; + #waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix; + #waybarChoice = ../../modules/home/waybar/waybar-dwm.nix; + #waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix; + #waybarChoice = ../../modules/home/waybar/waybar-tony.nix; + #waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix; + #waybarChoice = ../../modules/home/waybar/waybar-mecha.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix; + #waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix; + #waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix; + #waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix; + #waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix; - # Set Waybar - # Available options: - waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix; - #waybarChoice = ../../modules/home/waybar/waybar-simple.nix; - #waybarChoice = ../../modules/home/waybar/waybar-curved.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jerry.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix; - #waybarChoice = ../../modules/home/waybar/waybar-dwm.nix; - #waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix; - #waybarChoice = ../../modules/home/waybar/waybar-tony.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix; - #waybarChoice = ../../modules/home/waybar/waybar-mecha.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix; - #waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix; + # Set Animation style + # Available options are: + animChoice = ../../modules/home/hyprland/animations-end4.nix; + #animChoice = ../../modules/home/hyprland/animations-def.nix; + #animChoice = ../../modules/home/hyprland/animations-end4-slide.nix; + #animChoice = ../../modules/home/hyprland/animations-end-slide.nix; + #animChoice = ../../modules/home/hyprland/animations-dynamic.nix; + #animChoice = ../../modules/home/hyprland/animations-moving.nix; + #animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix; + #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix; + #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix; + #animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix; + #animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix; + #animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix; - # Set Animation style - # Available options are: - animChoice = ../../modules/home/hyprland/animations-end4.nix; - #animChoice = ../../modules/home/hyprland/animations-def.nix; - #animChoice = ../../modules/home/hyprland/animations-end4-slide.nix; - #animChoice = ../../modules/home/hyprland/animations-end-slide.nix; - #animChoice = ../../modules/home/hyprland/animations-dynamic.nix; - #animChoice = ../../modules/home/hyprland/animations-moving.nix; - #animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix; - #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix; - #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix; - - # Set network hostId if required (needed for zfs) - # Otherwise leave as-is - hostId = "5ab03f50"; + # Set network hostId if required (needed for zfs) + # Otherwise leave as-is + hostId = "5ab03f50"; + }; } diff --git a/modules/core/default.nix b/modules/core/default.nix index fc6f714..dc19bc8 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -1,12 +1,6 @@ -{ - inputs, - host, - ... -}: let - # Import the host-specific variables.nix - vars = import ../../hosts/${host}/variables.nix; -in { +{inputs, ...}: { imports = [ + ../options.nix ./boot.nix ./flatpak.nix ./fonts.nix @@ -15,14 +9,11 @@ in { ./nfs.nix ./nh.nix ./quickshell.nix + ./overlays.nix ./packages.nix ./printing.nix - # Conditionally import the display manager module - ( - if vars.displayManager == "tui" - then ./ly.nix - else ./sddm.nix - ) + ./ly.nix + ./sddm.nix ./security.nix ./services.nix ./steam.nix diff --git a/modules/core/hardware.nix b/modules/core/hardware.nix index f34c74d..72e0f18 100644 --- a/modules/core/hardware.nix +++ b/modules/core/hardware.nix @@ -1,7 +1,13 @@ -{pkgs, ...}: { +{ + config, + pkgs, + ... +}: let + inherit (config.zaneyos) scannerEnable; +in { hardware = { sane = { - enable = true; + enable = scannerEnable; extraBackends = [pkgs.sane-airscan]; disabledDefaultBackends = ["escl"]; }; diff --git a/modules/core/ly.nix b/modules/core/ly.nix index e50fb41..1f83f19 100644 --- a/modules/core/ly.nix +++ b/modules/core/ly.nix @@ -1,13 +1,9 @@ { - host, + config, lib, ... -}: let - # Import the host-specific variables.nix - vars = import ../../hosts/${host}/variables.nix; - useLy = vars.displayManager == "tui"; -in { - config = lib.mkIf useLy { +}: { + config = lib.mkIf (config.zaneyos.displayManager == "tui") { # Prefer ly when TUI is selected; avoid greetd conflicts services.greetd.enable = lib.mkDefault false; diff --git a/modules/core/network.nix b/modules/core/network.nix index 325f7a0..d56324b 100644 --- a/modules/core/network.nix +++ b/modules/core/network.nix @@ -1,14 +1,14 @@ { pkgs, - host, options, + config, ... }: let - inherit (import ../../hosts/${host}/variables.nix) hostId; + inherit (config.zaneyos) hostName hostId; in { networking = { - hostName = "${host}"; - hostId = hostId; + inherit hostName; + inherit hostId; networkmanager.enable = true; timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"]; firewall = { diff --git a/modules/core/nfs.nix b/modules/core/nfs.nix index adbcde8..d42f45e 100644 --- a/modules/core/nfs.nix +++ b/modules/core/nfs.nix @@ -1,8 +1,9 @@ -{host, ...}: let - inherit (import ../../hosts/${host}/variables.nix) enableNFS; +{config, ...}: let + inherit (config.zaneyos) enableNFS; in { services = { rpcbind.enable = enableNFS; nfs.server.enable = enableNFS; }; } + diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 7710737..4043b5c 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -1,10 +1,9 @@ { pkgs, - host, + config, ... }: let - vars = import ../../hosts/${host}/variables.nix; - inherit (vars) barChoice; + inherit (config.zaneyos) barChoice ; # Noctalia-specific packages noctaliaPkgs = if barChoice == "noctalia" diff --git a/modules/core/printing.nix b/modules/core/printing.nix index 982126f..7e89b43 100644 --- a/modules/core/printing.nix +++ b/modules/core/printing.nix @@ -1,5 +1,5 @@ -{host, ...}: let - inherit (import ../../hosts/${host}/variables.nix) printEnable; +{config, ...}: let + inherit (config.zaneyos) printEnable; in { services = { printing = { @@ -15,4 +15,4 @@ in { }; ipp-usb.enable = printEnable; }; -} +} \ No newline at end of file diff --git a/modules/core/sddm.nix b/modules/core/sddm.nix index c173803..f690811 100644 --- a/modules/core/sddm.nix +++ b/modules/core/sddm.nix @@ -3,7 +3,6 @@ pkgs, config, lib, - host, ... }: let foreground = config.stylix.base16Scheme.base00; @@ -62,33 +61,33 @@ }; }; in { - services.displayManager = { - sddm = { - package = pkgs.kdePackages.sddm; - extraPackages = [sddm-astronaut]; - enable = true; - wayland.enable = true; - theme = "sddm-astronaut-theme"; - settings = let - vars = import ../../hosts/${host}/variables.nix; - keyboardLayout = vars.keyboardLayout or "us"; - keyboardVariant = vars.keyboardVariant or ""; - in { - X11 = { - XkbLayout = keyboardLayout; - XkbVariant = keyboardVariant; + config = lib.mkIf (config.zaneyos.displayManager == "sddm") { + services.displayManager = { + sddm = { + package = pkgs.kdePackages.sddm; + extraPackages = [sddm-astronaut]; + enable = true; + wayland.enable = true; + theme = "sddm-astronaut-theme"; + settings = let + keyboardLayout = config.zaneyos.keyboardLayout; + keyboardVariant = config.zaneyos.keyboardVariant; + in { + X11 = { + XkbLayout = keyboardLayout; + XkbVariant = keyboardVariant; + }; }; }; }; + + # Ensure Wayland SDDM also sees XKB defaults + systemd.services.display-manager.environment = let + keyboardLayout = config.zaneyos.keyboardLayout; + keyboardVariant = config.zaneyos.keyboardVariant; + in ({XKB_DEFAULT_LAYOUT = keyboardLayout;} + // lib.optionalAttrs (keyboardVariant != "") {XKB_DEFAULT_VARIANT = keyboardVariant;}); + + environment.systemPackages = [sddm-astronaut]; }; - - # Ensure Wayland SDDM also sees XKB defaults - systemd.services.display-manager.environment = let - vars = import ../../hosts/${host}/variables.nix; - keyboardLayout = vars.keyboardLayout or "us"; - keyboardVariant = vars.keyboardVariant or ""; - in ({XKB_DEFAULT_LAYOUT = keyboardLayout;} - // lib.optionalAttrs (keyboardVariant != "") {XKB_DEFAULT_VARIANT = keyboardVariant;}); - - environment.systemPackages = [sddm-astronaut]; -} +} \ No newline at end of file diff --git a/modules/core/services.nix b/modules/core/services.nix index caf5798..3aba8c4 100644 --- a/modules/core/services.nix +++ b/modules/core/services.nix @@ -1,4 +1,6 @@ -{profile, ...}: { +{config, ...}: let + inherit (config.zaneyos) enableSmartD; +in { # Services to start services = { upower.enable = true; # noctalia shell battery @@ -20,10 +22,7 @@ gnome.gnome-keyring.enable = true; smartd = { - enable = - if profile == "vm" - then false - else true; + enable = enableSmartD; autodetect = true; }; pipewire = { diff --git a/modules/core/stylix.nix b/modules/core/stylix.nix index 3ed5d35..c48870f 100644 --- a/modules/core/stylix.nix +++ b/modules/core/stylix.nix @@ -1,9 +1,9 @@ { pkgs, - host, + config, ... }: let - inherit (import ../../hosts/${host}/variables.nix) stylixImage; + inherit (config.zaneyos) stylixImage; in { # Styling Options stylix = { @@ -56,3 +56,4 @@ in { }; }; } + diff --git a/modules/core/system.nix b/modules/core/system.nix index d89981e..eb7dd2b 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -1,6 +1,9 @@ -{host, ...}: let - vars = import ../../hosts/${host}/variables.nix; - consoleKeyMap = vars.consoleKeyMap or "us"; +{ + config, + inputs, + ... +}: let + inherit (config.zaneyos) consoleKeyMap; in { nix = { settings = { diff --git a/modules/core/thunar.nix b/modules/core/thunar.nix index c7419e0..ffce58e 100644 --- a/modules/core/thunar.nix +++ b/modules/core/thunar.nix @@ -1,9 +1,9 @@ { - host, + config, pkgs, ... }: let - inherit (import ../../hosts/${host}/variables.nix) thunarEnable; + inherit (config.zaneyos) thunarEnable; in { programs = { thunar = { @@ -18,3 +18,4 @@ in { ffmpegthumbnailer # Need For Video / Image Preview ]; } + diff --git a/modules/core/user.nix b/modules/core/user.nix index a292018..5e440a7 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -1,19 +1,22 @@ { - pkgs, - inputs, - username, + config, host, - profile, + inputs, + pkgs, + username, ... }: let - inherit (import ../../hosts/${host}/variables.nix) gitUsername; + inherit (config.zaneyos) gitUsername; in { imports = [inputs.home-manager.nixosModules.home-manager]; home-manager = { useUserPackages = true; useGlobalPkgs = false; backupFileExtension = "backup"; - extraSpecialArgs = {inherit inputs username host profile pkgs;}; + extraSpecialArgs = { + inherit inputs username host pkgs; + inherit (config) zaneyos; + }; users.${username} = { imports = [./../home]; home = { diff --git a/modules/core/xserver.nix b/modules/core/xserver.nix index 98f88e7..690eec0 100644 --- a/modules/core/xserver.nix +++ b/modules/core/xserver.nix @@ -1,7 +1,6 @@ -{host, ...}: let - vars = import ../../hosts/${host}/variables.nix; - keyboardLayout = vars.keyboardLayout or "us"; - keyboardVariant = vars.keyboardVariant or ""; +{config, ...}: let + inherit (config.zaneyos) keyboardLayout; + inherit (config.zaneyos) keyboardVariant; # Treat only known US-based variants as implying layout = "us". usVariants = ["dvorak" "colemak" "workman" "intl" "us-intl" "altgr-intl"]; @@ -43,3 +42,4 @@ in { }; }; } + diff --git a/modules/home/bash.nix b/modules/home/bash.nix index ba4de54..db4fec8 100644 --- a/modules/home/bash.nix +++ b/modules/home/bash.nix @@ -1,4 +1,6 @@ -{profile, ...}: { +{zaneyos, ...}: let + profile = zaneyos.hostName; +in { programs.bash = { enable = false; enableCompletion = true; diff --git a/modules/home/cli/git.nix b/modules/home/cli/git.nix index 5a509ad..c4d0af8 100644 --- a/modules/home/cli/git.nix +++ b/modules/home/cli/git.nix @@ -1,5 +1,5 @@ -{host, ...}: let - inherit (import ../../../hosts/${host}/variables.nix) gitUsername gitEmail; +{zaneyos, ...}: let + inherit (zaneyos) gitUsername gitEmail; in { programs.git = { enable = true; @@ -33,3 +33,4 @@ in { }; }; } + diff --git a/modules/home/default.nix b/modules/home/default.nix index f6b29e7..974acfa 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,7 +1,6 @@ -{host, ...}: let - vars = import ../../hosts/${host}/variables.nix; +{zaneyos, ...}: let inherit - (vars) + (zaneyos) alacrittyEnable barChoice ghosttyEnable @@ -13,6 +12,7 @@ doomEmacsEnable antigravityEnable ; + # Select bar module based on barChoice barModule = if barChoice == "noctalia" @@ -106,3 +106,4 @@ in { else [] ); } + diff --git a/modules/home/hyprland/animations-end-slide.nix b/modules/home/hyprland/animations-end-slide.nix index 5a518fe..70f82f8 100644 --- a/modules/home/hyprland/animations-end-slide.nix +++ b/modules/home/hyprland/animations-end-slide.nix @@ -1,8 +1,4 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - ; -in { +_: { wayland.windowManager.hyprland.settings = { # Name: END-4-slide Modified to better support Hyprtrails # Credit: END-4 project https://github.com/end-4/dots-hyprland diff --git a/modules/home/hyprland/animations-end4-slide.nix b/modules/home/hyprland/animations-end4-slide.nix index 5a518fe..70f82f8 100644 --- a/modules/home/hyprland/animations-end4-slide.nix +++ b/modules/home/hyprland/animations-end4-slide.nix @@ -1,8 +1,4 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - ; -in { +_: { wayland.windowManager.hyprland.settings = { # Name: END-4-slide Modified to better support Hyprtrails # Credit: END-4 project https://github.com/end-4/dots-hyprland diff --git a/modules/home/hyprland/animations-hyde-optimized.nix b/modules/home/hyprland/animations-hyde-optimized.nix index 6e2d0af..b9998f9 100644 --- a/modules/home/hyprland/animations-hyde-optimized.nix +++ b/modules/home/hyprland/animations-hyde-optimized.nix @@ -1,8 +1,4 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - ; -in { +_: { wayland.windowManager.hyprland.settings = { animations = { enabled = true; diff --git a/modules/home/hyprland/animations-mahaveer-me-1.nix b/modules/home/hyprland/animations-mahaveer-me-1.nix index 82901a5..2f5d366 100644 --- a/modules/home/hyprland/animations-mahaveer-me-1.nix +++ b/modules/home/hyprland/animations-mahaveer-me-1.nix @@ -1,8 +1,4 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - ; -in { +_: { wayland.windowManager.hyprland.settings = { animations = { enabled = true; diff --git a/modules/home/hyprland/animations-mahaveer-me-2.nix b/modules/home/hyprland/animations-mahaveer-me-2.nix index 9bc6903..4ffbc2c 100644 --- a/modules/home/hyprland/animations-mahaveer-me-2.nix +++ b/modules/home/hyprland/animations-mahaveer-me-2.nix @@ -1,8 +1,4 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - ; -in { +_: { wayland.windowManager.hyprland.settings = { animations = { enabled = true; diff --git a/modules/home/hyprland/animations-ml4w-classic.nix b/modules/home/hyprland/animations-ml4w-classic.nix index ec20d3b..eead230 100644 --- a/modules/home/hyprland/animations-ml4w-classic.nix +++ b/modules/home/hyprland/animations-ml4w-classic.nix @@ -1,8 +1,4 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - ; -in { +_: { wayland.windowManager.hyprland.settings = { animations = { enabled = true; diff --git a/modules/home/hyprland/animations-ml4w-fast.nix b/modules/home/hyprland/animations-ml4w-fast.nix index 08edb6a..2a21abd 100644 --- a/modules/home/hyprland/animations-ml4w-fast.nix +++ b/modules/home/hyprland/animations-ml4w-fast.nix @@ -1,8 +1,4 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - ; -in { +_: { wayland.windowManager.hyprland.settings = { animations = { enabled = true; diff --git a/modules/home/hyprland/animations-ml4w-high.nix b/modules/home/hyprland/animations-ml4w-high.nix index 912f882..2190185 100644 --- a/modules/home/hyprland/animations-ml4w-high.nix +++ b/modules/home/hyprland/animations-ml4w-high.nix @@ -1,8 +1,4 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - ; -in { +_: { wayland.windowManager.hyprland.settings = { animations = { enabled = true; diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 044240a..c3d8e99 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -1,7 +1,6 @@ -{host, ...}: let - vars = import ../../../hosts/${host}/variables.nix; +{zaneyos, ...}: let inherit - (vars) + (zaneyos) barChoice browser terminal @@ -160,3 +159,4 @@ in { ]; }; } + diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index ab286ca..6ff3bee 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -1,5 +1,5 @@ -{host, ...}: let - inherit (import ../../../hosts/${host}/variables.nix) animChoice; +{zaneyos, ...}: let + inherit (zaneyos) animChoice; in { imports = [ animChoice @@ -13,3 +13,4 @@ in { ./windowrules.nix ]; } + diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index 3375433..943aebd 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -1,10 +1,5 @@ -{host, ...}: let - vars = import ../../../hosts/${host}/variables.nix; - inherit - (vars) - barChoice - stylixImage - ; +{zaneyos, ...}: let + inherit (zaneyos) barChoice stylixImage; # Noctalia-specific startup commands noctaliaExec = if barChoice == "noctalia" @@ -44,3 +39,4 @@ in { ++ noctaliaExec ++ waybarExec; }; } + diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index ce1027f..3417be0 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -1,15 +1,13 @@ { - host, + zaneyos, config, pkgs, lib, ... }: let - vars = import ../../../hosts/${host}/variables.nix; - extraMonitorSettings = vars.extraMonitorSettings or ""; - keyboardLayout = vars.keyboardLayout or "us"; - keyboardVariant = vars.keyboardVariant or ""; - stylixImage = vars.stylixImage or null; + inherit (zaneyos) extraMonitorSettings; + keyboardLayout = zaneyos.keyboardLayout; + keyboardVariant = zaneyos.keyboardVariant; # Treat only known US-based variants as implying layout = "us". usVariants = ["dvorak" "colemak" "workman" "intl" "us-intl" "altgr-intl"]; @@ -202,4 +200,4 @@ in { #layerrule = blur,waybar "; }; -} +} \ No newline at end of file diff --git a/modules/home/hyprland/windowrules.nix b/modules/home/hyprland/windowrules.nix index 87cd9aa..7db4942 100644 --- a/modules/home/hyprland/windowrules.nix +++ b/modules/home/hyprland/windowrules.nix @@ -1,9 +1,4 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - extraMonitorSettings - ; -in { +_: { wayland.windowManager.hyprland = { settings = { windowrule = [ diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 69c0598..c9e7c33 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -2,7 +2,7 @@ config, pkgs, username, - profile, + zaneyos, ... }: { home.packages = [ @@ -39,7 +39,8 @@ (import ./launch-nwg-menu.nix {inherit pkgs;}) (import ./hyprland-dock.nix {inherit pkgs;}) (import ./zcli.nix { - inherit pkgs profile; + inherit pkgs; + inherit zaneyos; backupFiles = [ ".config/mimeapps.list.backup" ]; diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index d905fb6..b310d41 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -1,6 +1,6 @@ { + zaneyos, pkgs, - profile, backupFiles ? [".config/mimeapps.list.backup"], ... }: let @@ -130,7 +130,7 @@ in # --- Configuration --- PROJECT="zaneyos" #ddubos or zaneyos - PROFILE="${profile}" + PROFILE="${zaneyos.hostName}" BACKUP_FILES_STR="${backupFilesString}" VERSION="1.0.2" FLAKE_NIX_PATH="$HOME/$PROJECT/flake.nix" diff --git a/modules/home/waybar/waybar-TheBlackDon.nix b/modules/home/waybar/waybar-TheBlackDon.nix index 60df038..140304a 100644 --- a/modules/home/waybar/waybar-TheBlackDon.nix +++ b/modules/home/waybar/waybar-TheBlackDon.nix @@ -1,11 +1,10 @@ { - pkgs, - lib, - host, config, + lib, + pkgs, ... }: let - inherit (import ../../../hosts/${host}/variables.nix) clock24h; + inherit (config.zaneyos) clock24h; scriptsDir = ./scripts; scripts = builtins.attrNames (builtins.readDir scriptsDir); in diff --git a/modules/home/waybar/waybar-curved.nix b/modules/home/waybar/waybar-curved.nix index 33e46fe..8dfb9fc 100644 --- a/modules/home/waybar/waybar-curved.nix +++ b/modules/home/waybar/waybar-curved.nix @@ -1,12 +1,12 @@ { pkgs, lib, - host, + zaneyos, config, ... }: let betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)"; - inherit (import ../../../hosts/${host}/variables.nix) clock24h; + inherit (zaneyos) clock24h; in with lib; { # Configure & Theme Waybar @@ -274,4 +274,4 @@ in '' ]; }; - } + } \ No newline at end of file diff --git a/modules/home/waybar/waybar-ddubs.nix b/modules/home/waybar/waybar-ddubs.nix index 08edf50..86ffdf3 100644 --- a/modules/home/waybar/waybar-ddubs.nix +++ b/modules/home/waybar/waybar-ddubs.nix @@ -6,7 +6,7 @@ ... }: let betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)"; - inherit (import ../../../hosts/${host}/variables.nix) clock24h; + inherit (config.zaneyos) clock24h; in with lib; { # Configure & Theme Waybar diff --git a/modules/home/waybar/waybar-ddubsos-v1.nix b/modules/home/waybar/waybar-ddubsos-v1.nix index 4af0fed..d9a427e 100644 --- a/modules/home/waybar/waybar-ddubsos-v1.nix +++ b/modules/home/waybar/waybar-ddubsos-v1.nix @@ -2,11 +2,10 @@ pkgs, config, lib, - host, ... }: let betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)"; - inherit (import ../../../hosts/${host}/variables.nix) clock24h; + inherit (config.zaneyos) clock24h; scriptsDir = ./scripts; scripts = builtins.attrNames (builtins.readDir scriptsDir); in diff --git a/modules/home/waybar/waybar-nekodyke.nix b/modules/home/waybar/waybar-nekodyke.nix index 11aebd0..64a9b4d 100755 --- a/modules/home/waybar/waybar-nekodyke.nix +++ b/modules/home/waybar/waybar-nekodyke.nix @@ -1,12 +1,12 @@ { pkgs, lib, - host, config, + options, ... }: let betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)"; - inherit (import ../../../hosts/${host}/variables.nix) clock24h; + inherit (options.zaneyos) clock24h; in with lib; { # Configure & Theme Waybar diff --git a/modules/home/waybar/waybar-simple.nix b/modules/home/waybar/waybar-simple.nix index 04f1ae0..8d8b8a4 100644 --- a/modules/home/waybar/waybar-simple.nix +++ b/modules/home/waybar/waybar-simple.nix @@ -1,11 +1,10 @@ { pkgs, lib, - host, config, ... }: let - inherit (import ../../../hosts/${host}/variables.nix) clock24h; + inherit (config.zaneyos) clock24h; in with lib; { # Configure & Theme Waybar diff --git a/modules/home/waybar/waybar-tony.nix b/modules/home/waybar/waybar-tony.nix index f01fdca..8696553 100644 --- a/modules/home/waybar/waybar-tony.nix +++ b/modules/home/waybar/waybar-tony.nix @@ -1,11 +1,8 @@ { pkgs, lib, - host, - config, ... }: let - inherit (import ../../../hosts/${host}/variables.nix) clock24h; scriptsDir = ./scripts; scripts = builtins.attrNames (builtins.readDir scriptsDir); in diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix index 9f1bcbb..4f2284e 100644 --- a/modules/home/zsh/default.nix +++ b/modules/home/zsh/default.nix @@ -1,9 +1,11 @@ { - profile, pkgs, lib, + zaneyos, ... -}: { +}: let + profile = zaneyos.hostName; +in { imports = [ ./zshrc-personal.nix ]; diff --git a/modules/options.nix b/modules/options.nix new file mode 100644 index 0000000..9c8b89a --- /dev/null +++ b/modules/options.nix @@ -0,0 +1,234 @@ +{lib, ...}: +with lib; { + options.zaneyos = { + # Git Configuration ( For Pulling Software Repos ) + gitUsername = mkOption { + type = types.str; + example = "Tyler Kelley"; + description = "Git username for configuration."; + }; + gitEmail = mkOption { + type = types.str; + example = "tylerzanekelley@gmail.com"; + description = "Git email for configuration."; + }; + hostName = mkOption { + type = types.str; + description = "Machine hostname, can have .local suffix or a fqdn if needed"; + example = "hostname"; + }; + + # Set Display Manager + # `tui` for Text login + # `sddm` for graphical GUI (default) + # SDDM background is set with stylixImage + displayManager = mkOption { + type = types.enum ["tui" "sddm"]; + default = "sddm"; + description = "Display manager to use."; + }; + + gpuProfile = mkOption { + type = types.enum ["amd" "nvidia" "nvidia-laptop" "amd-hybrid" "intel" "vm"]; + example = "nvidia"; + description = "GPU profile for drivers."; + }; + + # Enable/disable bundled applications + tmuxEnable = mkOption { + type = types.bool; + default = false; + description = "Enable tmux."; + }; + alacrittyEnable = mkOption { + type = types.bool; + default = false; + description = "Enable Alacritty."; + }; + weztermEnable = mkOption { + type = types.bool; + default = false; + description = "Enable WezTerm."; + }; + ghosttyEnable = mkOption { + type = types.bool; + default = false; + description = "Enable Ghostty."; + }; + vscodeEnable = mkOption { + type = types.bool; + default = false; + description = "Enable VSCode."; + }; + # Google port of vscodium + antigravityEnable = mkOption { + type = types.bool; + default = false; + description = "Enable Antigravity."; + }; + # Note: This is evil-helix with VIM keybindings by default + helixEnable = mkOption { + type = types.bool; + default = false; + description = "Enable Helix."; + }; + # To install: Enable here, zcli rebuild, then run zcli doom install + doomEmacsEnable = mkOption { + type = types.bool; + default = false; + description = "Enable Doom Emacs."; + }; + + # Python development tools + pythonEnable = mkOption { + type = types.bool; + default = true; + description = "Enable Python development tools."; + }; + + # Hyprland Settings + # You can configure multiple monitors. + # Inside the quotes, create a new line for each monitor. + extraMonitorSettings = + mkOption { + type = types.lines; + default = " + + "; + description = "Extra monitor settings for Hyprland."; + }; + + # Bar/Shell Settings + # Choose between noctalia or waybar + barChoice = mkOption { + type = types.enum ["noctalia" "waybar"]; + default = "noctalia"; + description = "Bar/Shell choice."; + }; + + # Waybar Settings (used when barChoice = "waybar") + clock24h = mkOption { + type = types.bool; + default = false; + description = "Use 24h clock in Waybar."; + }; + + # 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 + # + # refactor TODO: make the options we provide install + browser = mkOption { + type = types.str; + default = "brave"; + description = "Default browser."; + }; + # Note: kitty, wezterm, alacritty have to be enabled in `variables.nix` + # Setting it here does not enable it. Kitty is installed by default + # refactor TODO: combine package insallation and default and options, + # and make this a package argument so unstable can be given + terminal = mkOption { + type = types.str; + default = "kitty"; + description = "Default system terminal."; + }; + + # Keyboard and Console + keyboardLayout = mkOption { + type = types.str; + default = "us"; + description = "Keyboard layout."; + }; + keyboardVariant = mkOption { + type = types.str; + default = ""; + description = "Keyboard variant."; + }; + consoleKeyMap = mkOption { + type = types.str; + default = "us"; + description = "Console key map."; + }; + + # For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA) + intelID = mkOption { + type = types.str; + default = "PCI:1:0:0"; + description = "Intel GPU Bus ID."; + }; + amdgpuID = mkOption { + type = types.str; + default = "PCI:5:0:0"; + description = "AMD GPU Bus ID."; + }; + nvidiaID = mkOption { + type = types.str; + default = "PCI:0:2:0"; + description = "Nvidia GPU Bus ID."; + }; + + # Enable NFS + enableNFS = mkOption { + type = types.bool; + default = true; + description = "Enable NFS."; + }; + + # Enable Printing Support + printEnable = mkOption { + type = types.bool; + default = false; + description = "Enable printing support."; + }; + scannerEnable = mkOption { + type = types.bool; + default = true; + description = "Enable scanning support."; + }; + + # Yazi is default File Manager. + thunarEnable = mkOption { + type = types.bool; + default = false; + description = "Enable Thunar GUI File Manager."; + }; + + # Themes, waybar and animation + + # Set Stylix Image + # This will set your color palette + # Default background + # Add new images to ~/zaneyos/wallpapers + stylixImage = mkOption { + type = types.path; + example = "../../wallpapers/mountainscapedark.jpg"; + description = "Wallpaper image for Stylix."; + }; + waybarChoice = mkOption { + type = types.path; + example = "../../modules/home/waybar/waybar-curved.nix"; + description = "Path to Waybar configuration file."; + }; + animChoice = mkOption { + type = types.path; + example = "../../modules/home/hyprland/animations-def.nix"; + description = "Path to animation configuration file."; + }; + + enableSmartD = mkOption { + type = types.bool; + default = true; + description = "Can be disabled for hosts without real disks."; + }; + + # Set network hostId if required (needed for zfs) + # Otherwise leave as-is + hostId = mkOption { + type = types.str; + default = "5ab03f50"; + description = "Network hostId."; + }; + }; +} diff --git a/profiles/amd-hybrid/default.nix b/profiles/amd-hybrid/default.nix index 1e1a133..7da752b 100644 --- a/profiles/amd-hybrid/default.nix +++ b/profiles/amd-hybrid/default.nix @@ -1,24 +1,22 @@ -{host, ...}: let - inherit (import ../../hosts/${host}/variables.nix) amdgpuID nvidiaID; -in { - imports = [ - ../../hosts/${host} - ../../modules/drivers - ../../modules/core - ]; +{ + config, + lib, + ... +}: { + config = lib.mkIf (config.zaneyos.gpuProfile == "amd-hybrid") { + # Enable AMD+NVIDIA hybrid drivers (Prime offload with AMD as primary) + drivers.nvidia-amd-hybrid = { + enable = true; + amdgpuBusID = config.zaneyos.amdgpuID; + nvidiaBusID = config.zaneyos.nvidiaID; + }; - # Enable AMD+NVIDIA hybrid drivers (Prime offload with AMD as primary) - drivers.nvidia-amd-hybrid = { - enable = true; - amdgpuBusID = "${amdgpuID}"; - nvidiaBusID = "${nvidiaID}"; + # Ensure other driver toggles are off for this profile + drivers.amdgpu.enable = false; + drivers.nvidia.enable = false; + drivers.nvidia-prime.enable = false; + drivers.intel.enable = false; + + vm.guest-services.enable = false; }; - - # Ensure other driver toggles are off for this profile - drivers.amdgpu.enable = false; - drivers.nvidia.enable = false; - drivers.nvidia-prime.enable = false; - drivers.intel.enable = false; - - vm.guest-services.enable = false; -} +} \ No newline at end of file diff --git a/profiles/amd/default.nix b/profiles/amd/default.nix index 1b5506b..a277a7e 100644 --- a/profiles/amd/default.nix +++ b/profiles/amd/default.nix @@ -1,13 +1,14 @@ -{host, ...}: { - imports = [ - ../../hosts/${host} - ../../modules/drivers - ../../modules/core - ]; - # Enable GPU Drivers - drivers.amdgpu.enable = true; - drivers.nvidia.enable = false; - drivers.nvidia-prime.enable = false; - drivers.intel.enable = false; - vm.guest-services.enable = false; -} +{ + config, + lib, + ... +}: { + config = lib.mkIf (config.zaneyos.gpuProfile == "amd") { + # Enable GPU Drivers + drivers.amdgpu.enable = true; + drivers.nvidia.enable = false; + drivers.nvidia-prime.enable = false; + drivers.intel.enable = false; + vm.guest-services.enable = false; + }; +} \ No newline at end of file diff --git a/profiles/default.nix b/profiles/default.nix new file mode 100644 index 0000000..443bc1c --- /dev/null +++ b/profiles/default.nix @@ -0,0 +1,10 @@ +_: { + imports = [ + ./amd + ./amd-hybrid + ./intel + ./nvidia + ./nvidia-laptop + ./vm + ]; +} diff --git a/profiles/intel/default.nix b/profiles/intel/default.nix index f99a114..3e71b09 100644 --- a/profiles/intel/default.nix +++ b/profiles/intel/default.nix @@ -1,13 +1,14 @@ -{host, ...}: { - imports = [ - ../../hosts/${host} - ../../modules/drivers - ../../modules/core - ]; - # Enable GPU Drivers - drivers.amdgpu.enable = false; - drivers.nvidia.enable = false; - drivers.nvidia-prime.enable = false; - drivers.intel.enable = true; - vm.guest-services.enable = false; -} +{ + config, + lib, + ... +}: { + config = lib.mkIf (config.zaneyos.gpuProfile == "intel") { + # Enable GPU Drivers + drivers.amdgpu.enable = false; + drivers.nvidia.enable = false; + drivers.nvidia-prime.enable = false; + drivers.intel.enable = true; + vm.guest-services.enable = false; + }; +} \ No newline at end of file diff --git a/profiles/nvidia-laptop/default.nix b/profiles/nvidia-laptop/default.nix index 2c4444b..49332ae 100644 --- a/profiles/nvidia-laptop/default.nix +++ b/profiles/nvidia-laptop/default.nix @@ -1,19 +1,18 @@ -{host, ...}: let - inherit (import ../../hosts/${host}/variables.nix) intelID nvidiaID; -in { - imports = [ - ../../hosts/${host} - ../../modules/drivers - ../../modules/core - ]; - # Enable GPU Drivers - drivers.amdgpu.enable = false; - drivers.nvidia.enable = true; - drivers.nvidia-prime = { - enable = true; - intelBusID = "${intelID}"; - nvidiaBusID = "${nvidiaID}"; +{ + config, + lib, + ... +}: { + config = lib.mkIf (config.zaneyos.gpuProfile == "nvidia-laptop") { + # Enable GPU Drivers + drivers.amdgpu.enable = false; + drivers.nvidia.enable = true; + drivers.nvidia-prime = { + enable = true; + intelBusID = config.zaneyos.intelID; + nvidiaBusID = config.zaneyos.nvidiaID; + }; + drivers.intel.enable = false; + vm.guest-services.enable = false; }; - drivers.intel.enable = false; - vm.guest-services.enable = false; -} +} \ No newline at end of file diff --git a/profiles/nvidia/default.nix b/profiles/nvidia/default.nix index 5b50370..6a63124 100644 --- a/profiles/nvidia/default.nix +++ b/profiles/nvidia/default.nix @@ -1,13 +1,14 @@ -{host, ...}: { - imports = [ - ../../hosts/${host} - ../../modules/drivers - ../../modules/core - ]; - # Enable GPU Drivers - drivers.amdgpu.enable = false; - drivers.nvidia.enable = true; - drivers.nvidia-prime.enable = false; - drivers.intel.enable = false; - vm.guest-services.enable = false; -} +{ + config, + lib, + ... +}: { + config = lib.mkIf (config.zaneyos.gpuProfile == "nvidia") { + # Enable GPU Drivers + drivers.amdgpu.enable = false; + drivers.nvidia.enable = true; + drivers.nvidia-prime.enable = false; + drivers.intel.enable = false; + vm.guest-services.enable = false; + }; +} \ No newline at end of file diff --git a/profiles/vm/default.nix b/profiles/vm/default.nix index 130c1b7..fbc2eb2 100644 --- a/profiles/vm/default.nix +++ b/profiles/vm/default.nix @@ -1,13 +1,14 @@ -{host, ...}: { - imports = [ - ../../hosts/${host} - ../../modules/drivers - ../../modules/core - ]; - # Enable GPU Drivers - drivers.amdgpu.enable = false; - drivers.nvidia.enable = false; - drivers.nvidia-prime.enable = false; - drivers.intel.enable = false; - vm.guest-services.enable = true; -} +{ + config, + lib, + ... +}: { + config = lib.mkIf (config.zaneyos.gpuProfile == "vm") { + # Enable GPU Drivers + drivers.amdgpu.enable = false; + drivers.nvidia.enable = false; + drivers.nvidia-prime.enable = false; + drivers.intel.enable = false; + vm.guest-services.enable = true; + }; +} \ No newline at end of file From c6c0a767a51c06c17762840262f3985eae85acef Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 10:47:17 -0500 Subject: [PATCH 006/232] 1st pass updating install and zcli to new paradigm On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh modified: modules/home/install-zaneyos.sh --- install-zaneyos.sh | 41 +++++++++++++++++++++++---------- modules/home/install-zaneyos.sh | 7 +++--- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 2737ec0..25632ed 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -155,7 +155,9 @@ if lspci | grep -qi 'vga\|3d'; then if $has_vm; then DETECTED_PROFILE="vm" elif $has_nvidia && $has_intel; then - DETECTED_PROFILE="hybrid" + DETECTED_PROFILE="nvidia-laptop" + elif $has_nvidia && $has_amd; then + DETECTED_PROFILE="amd-hybrid" elif $has_nvidia; then DETECTED_PROFILE="nvidia" elif $has_amd; then @@ -183,10 +185,11 @@ if [ -z "$profile" ]; then read -rp "Enter Your Hardware Profile (GPU) Options: [ amd ] -nvidia -nvidia-laptop -intel -vm + nvidia + nvidia-laptop + amd-hybrid + intel + vm Please type out your choice: " profile if [ -z "$profile" ]; then profile="amd" @@ -391,20 +394,34 @@ cp ./modules/core/system.nix ./modules/core/system.nix.bak awk -v newtz="$timezone" '/^ time\.timeZone = / { sub(/"[^"]*"/, "\"" newtz "\""); } { print }' ./modules/core/system.nix.bak >./modules/core/system.nix rm ./modules/core/system.nix.bak -# Update variables in host file (do all keys in one pass to avoid quoting issues) +# Update variables in host file; support both old style and new zaneyos options block cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak awk -v v_user="$gitUsername" \ -v v_email="$gitEmail" \ + -v v_host="$hostName" \ + -v v_gpu="$profile" \ -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 "\"") } + BEGIN { in_block=0 } + /zaneyos\s*=\s*\{/ { in_block=1 } + in_block && /gitUsername\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_user "\"") } + in_block && /gitEmail\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_email "\"") } + in_block && /hostName\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_host "\"") } + in_block && /gpuProfile\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_gpu "\"") } + in_block && /keyboardLayout\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kb "\"") } + in_block && /keyboardVariant\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kv "\"") } + in_block && /consoleKeyMap\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_ckm "\"") } + /\};/ && in_block { in_block=0 } + + # Fallback for old style top-level keys + !in_block && /^\s*gitUsername\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_user "\"") } + !in_block && /^\s*gitEmail\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_email "\"") } + !in_block && /^\s*keyboardLayout\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kb "\"") } + !in_block && /^\s*keyboardVariant\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kv "\"") } + !in_block && /^\s*consoleKeyMap\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_ckm "\"") } { print } -' ./hosts/$hostName/variables.nix.bak >./hosts/$hostName/variables.nix +' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix rm ./hosts/$hostName/variables.nix.bak echo "Configuration files updated successfully!" diff --git a/modules/home/install-zaneyos.sh b/modules/home/install-zaneyos.sh index a3fdc50..5061bbb 100755 --- a/modules/home/install-zaneyos.sh +++ b/modules/home/install-zaneyos.sh @@ -172,9 +172,10 @@ else echo -e "${GREEN}I hope you find your time here enjoyable!${NC}" fi -print_header "Cloning zaneyos Repository" -git clone https://gitlab.com/dwilliam62/zaneyos.git --depth=1 ~/zaneyos -cd ~/zaneyos || exit 1 +# Use the repository where this script lives; no extra git clone needed +REPO_DIR="$(cd "$(dirname "$0")/../.." && pwd)" +print_header "Using local ZaneyOS repository at: $REPO_DIR" +cd "$REPO_DIR" || exit 1 print_header "Configuring Host and Profile" mkdir -p hosts/"$hostName" From 73551e9e72db1d55da4d7e66ead5bc7c08d71729 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 11:57:48 -0500 Subject: [PATCH 007/232] Updated ZOS-next version to 2.3.NG On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/core/system.nix --- modules/core/system.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/system.nix b/modules/core/system.nix index eb7dd2b..a2a98c2 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -32,7 +32,7 @@ in { }; environment.variables = { NIXOS_OZONE_WL = "1"; - ZANEYOS_VERSION = "2.5.6"; + ZANEYOS_VERSION = "2.5.NG"; ZANEYOS = "true"; }; console.keyMap = "${consoleKeyMap}"; From 1c5571818100105e203252a67f4f8b6684381168 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 13:23:01 -0500 Subject: [PATCH 008/232] Adding helium to potentially replace brave On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/core/overlays.nix modified: modules/core/packages.nix new file: pkgs/helium/default.nix --- modules/core/overlays.nix | 6 +++++ modules/core/packages.nix | 1 + pkgs/helium/default.nix | 53 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 pkgs/helium/default.nix diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index c7de92a..0535e35 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -2,5 +2,11 @@ nixpkgs.overlays = [ # Provide pkgs.google-antigravity via antigravity-nix overlay inputs.antigravity-nix.overlays.default + + # Local packages overlay + (final: prev: { + # Helium browser (AppImage wrapped) + helium = prev.callPackage ../../pkgs/helium { }; + }) ]; } diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 4043b5c..281474d 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -45,6 +45,7 @@ in { amfora # Fancy Terminal Browser For Gemini Protocol appimage-run # Needed For AppImage Support brave # Brave Browser + helium # Helium browser brightnessctl # For Screen Brightness Control cliphist # Clipboard manager using rofi menu cmatrix # Matrix Movie Effect In Terminal diff --git a/pkgs/helium/default.nix b/pkgs/helium/default.nix new file mode 100644 index 0000000..ffe5dfc --- /dev/null +++ b/pkgs/helium/default.nix @@ -0,0 +1,53 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "helium"; + # Pick a known Linux AppImage release; bump as needed. + version = "0.6.2.1"; + src = fetchurl { + url = "https://github.com/imputnet/helium-linux/releases/download/${version}/helium-${version}-x86_64.AppImage"; + sha256 = "1ngsxh4r7c4gmhxhimhwrr9bw8z8zdg02qw3vw3rkwbhbxxf0m7p"; + }; + contents = appimageTools.extractType2 { inherit pname version src; }; + +in appimageTools.wrapType2 { + inherit pname version src; + + # AppImages usually bundle their libs, but add a few common ones just in case. + extraPkgs = pkgs: with pkgs; [ + # graphics / input + libglvnd libdrm libgbm + libX11 libXcursor libXrender libXext libXtst libXi libXrandr libXScrnSaver + libxkbcommon wayland + # gtk stack + glib gtk3 + # audio / printing / notifications + alsa-lib libpulseaudio libnotify cups + # nss + nspr nss + # tray icon support + libappindicator-gtk3 at-spi2-atk at-spi2-core + ]; + + extraInstallCommands = '' + # Try to install desktop file and icon from the AppImage, if present. + if [ -f ${contents}/helium.desktop ]; then + install -Dm444 ${contents}/helium.desktop $out/share/applications/helium.desktop + substituteInPlace $out/share/applications/helium.desktop \ + --replace 'Exec=AppRun' 'Exec=helium' + fi + if [ -f ${contents}/helium.png ]; then + install -Dm444 ${contents}/helium.png $out/share/icons/hicolor/512x512/apps/helium.png + elif [ -f ${contents}/helium.svg ]; then + install -Dm444 ${contents}/helium.svg $out/share/icons/hicolor/scalable/apps/helium.svg + fi + ''; + + meta = with lib; { + description = "Private, fast, and honest web browser (AppImage wrapped)"; + homepage = "https://helium.computer/"; + license = licenses.gpl3Only; + platforms = [ "x86_64-linux" ]; + maintainers = []; + }; +} From 28f7f562ac9354788ccd883505a0f0dd2e35a2cb Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 13:25:49 -0500 Subject: [PATCH 009/232] Install script pulled wrong branch --- install-zaneyos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 25632ed..503f00e 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -237,7 +237,7 @@ else fi print_header "Cloning ZaneyOS Repository" -git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos +git clone https://gitlab.com/zaney/zaneyos.git -b zos-next --depth=1 ~/zaneyos cd ~/zaneyos || exit 1 print_header "Git Configuration" @@ -421,7 +421,7 @@ awk -v v_user="$gitUsername" \ !in_block && /^\s*keyboardVariant\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kv "\"") } !in_block && /^\s*consoleKeyMap\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_ckm "\"") } { print } -' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix +' ./hosts/$hostName/variables.nix.bak >./hosts/$hostName/variables.nix rm ./hosts/$hostName/variables.nix.bak echo "Configuration files updated successfully!" From a20e4699570f901ca123eb84d4836e4381f1069e Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 13:37:40 -0500 Subject: [PATCH 010/232] Fixing installer script On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh --- install-zaneyos.sh | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 503f00e..9cce92d 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -375,19 +375,30 @@ echo " installusername: $installusername" echo " hostName: $hostName" echo " profile: $profile" -# Update flake.nix (simple pattern replacements that work) -# Create backup first, before any changes +# Update flake.nix safely without removing existing hosts cp ./flake.nix ./flake.nix.bak -# Use sed for hostname (more reliable) -sed -i 's|^[[:space:]]*host[[:space:]]*=[[:space:]]*"[^"]*"| host = "'$hostName'"|' ./flake.nix.bak -# Use sed for profile (handles variable indentation) -sed -i 's|^[[:space:]]*profile[[:space:]]*=[[:space:]]*"[^"]*";| profile = "'$profile'";|' ./flake.nix.bak -# Use sed for username (handles variable indentation) -sed -i 's|^[[:space:]]*username[[:space:]]*=[[:space:]]*"[^"]*";| username = "'$installusername'";|' ./flake.nix.bak -echo -e "${GREEN}After sed replacements:${NC}" -grep -E "(host|profile|username) =" ./flake.nix.bak -cp ./flake.nix.bak ./flake.nix -rm ./flake.nix.bak + +# 1) Update username if present +sed -i '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 && match($0, /"[^\"]+"/) { + line=$0 + if (index(line, "\"" 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 + +# Show summary of effective username and hosts list lines +echo -e "${GREEN}After flake updates:${NC}" +grep -E "username\s*=|^\s*hosts\s*=|^\s*\"[^"]+\"$|^\s*\];$" -n ./flake.nix | sed -n '/hosts = \[/,/];/p' # Update timezone in system.nix cp ./modules/core/system.nix ./modules/core/system.nix.bak @@ -447,7 +458,8 @@ if [[ ! $REPLY =~ ^[Yy]$ ]]; then exit 1 fi -sudo nixos-rebuild boot --flake ~/zaneyos/#${profile} +# Build using the selected HOST (GPU profile is configured inside the host files) +sudo nixos-rebuild boot --flake ~/zaneyos#${hostName} # Check the exit status of the last command (nixos-rebuild) if [ $? -eq 0 ]; then From 9a0f22f2ef644c2704c698e204d14566f71cd7dd Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 13:40:39 -0500 Subject: [PATCH 011/232] I hate awk/grep/regrex errors On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh --- install-zaneyos.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 9cce92d..952d767 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -385,9 +385,8 @@ sed -i 's|^[[:space:]]*username[[:space:]]*=[[:space:]]*"[^"]*";| username = awk -v h="$hostName" ' BEGIN { in_hosts=0; seen=0 } /^\s*hosts\s*=\s*\[/ { in_hosts=1 } - in_hosts && match($0, /"[^\"]+"/) { - line=$0 - if (index(line, "\"" h "\"")>0) seen=1 + in_hosts && /"[^"]+"/ { + if (index($0, "\"" h "\"") > 0) seen=1 } in_hosts && /\];/ { if (!seen) print " \"" h "\"" @@ -402,7 +401,7 @@ grep -E "username\s*=|^\s*hosts\s*=|^\s*\"[^"]+\"$|^\s*\];$" -n ./flake.nix | se # Update timezone in system.nix cp ./modules/core/system.nix ./modules/core/system.nix.bak -awk -v newtz="$timezone" '/^ time\.timeZone = / { sub(/"[^"]*"/, "\"" newtz "\""); } { print }' ./modules/core/system.nix.bak >./modules/core/system.nix +sed -i -E "s|^ time\\.timeZone = \".*\";| time.timeZone = \"${timezone}\";|" ./modules/core/system.nix rm ./modules/core/system.nix.bak # Update variables in host file; support both old style and new zaneyos options block From 8414db64d37d42c1693d76125313e51808a263b5 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 13:44:15 -0500 Subject: [PATCH 012/232] Trying again --- install-zaneyos.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 952d767..9b62030 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -401,7 +401,9 @@ grep -E "username\s*=|^\s*hosts\s*=|^\s*\"[^"]+\"$|^\s*\];$" -n ./flake.nix | se # Update timezone in system.nix cp ./modules/core/system.nix ./modules/core/system.nix.bak -sed -i -E "s|^ time\\.timeZone = \".*\";| time.timeZone = \"${timezone}\";|" ./modules/core/system.nix +# Escape sed-sensitive chars in timezone (e.g., & and |) +tz_safe=$(printf '%s' "$timezone" | sed 's/[&|]/\\&/g') +sed -i -E 's|^ time\.timeZone = ".*";| time.timeZone = '"\"$tz_safe\""';|' ./modules/core/system.nix rm ./modules/core/system.nix.bak # Update variables in host file; support both old style and new zaneyos options block From a938f5c01820308800d78c1fe8095797e3d08bf5 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 13:47:27 -0500 Subject: [PATCH 013/232] rewrite #1 --- install-zaneyos.sh | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 9b62030..a7cd50a 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -414,26 +414,27 @@ awk -v v_user="$gitUsername" \ -v v_gpu="$profile" \ -v v_kb="$keyboardLayout" \ -v v_kv="$keyboardVariant" \ - -v v_ckm="$consoleKeyMap" ' - BEGIN { in_block=0 } - /zaneyos\s*=\s*\{/ { in_block=1 } - in_block && /gitUsername\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_user "\"") } - in_block && /gitEmail\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_email "\"") } - in_block && /hostName\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_host "\"") } - in_block && /gpuProfile\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_gpu "\"") } - in_block && /keyboardLayout\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kb "\"") } - in_block && /keyboardVariant\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kv "\"") } - in_block && /consoleKeyMap\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_ckm "\"") } - /\};/ && in_block { in_block=0 } + -v v_ckm="$consoleKeyMap" \ + -f /dev/stdin ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix <<'AWK' +BEGIN { in_block=0 } +/zaneyos[[:space:]]*=[[:space:]]*\{/ { in_block=1 } +in_block && /gitUsername[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_user "\"") } +in_block && /gitEmail[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_email "\"") } +in_block && /hostName[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_host "\"") } +in_block && /gpuProfile[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_gpu "\"") } +in_block && /keyboardLayout[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kb "\"") } +in_block && /keyboardVariant[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kv "\"") } +in_block && /consoleKeyMap[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_ckm "\"") } +/\};/ && in_block { in_block=0 } - # Fallback for old style top-level keys - !in_block && /^\s*gitUsername\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_user "\"") } - !in_block && /^\s*gitEmail\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_email "\"") } - !in_block && /^\s*keyboardLayout\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kb "\"") } - !in_block && /^\s*keyboardVariant\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kv "\"") } - !in_block && /^\s*consoleKeyMap\s*=\s*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_ckm "\"") } - { print } -' ./hosts/$hostName/variables.nix.bak >./hosts/$hostName/variables.nix +# Fallback for old style top-level keys +!in_block && /^[[:space:]]*gitUsername[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_user "\"") } +!in_block && /^[[:space:]]*gitEmail[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_email "\"") } +!in_block && /^[[:space:]]*keyboardLayout[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kb "\"") } +!in_block && /^[[:space:]]*keyboardVariant[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kv "\"") } +!in_block && /^[[:space:]]*consoleKeyMap[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_ckm "\"") } +{ print } +AWK rm ./hosts/$hostName/variables.nix.bak echo "Configuration files updated successfully!" From 8a4a32ba33e1696d6ff988460ffbe174b4b0bade Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 13:51:38 -0500 Subject: [PATCH 014/232] once more into the breech --- install-zaneyos.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index a7cd50a..fb76a6a 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -408,14 +408,9 @@ rm ./modules/core/system.nix.bak # Update variables in host file; support both old style and new zaneyos options block cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak -awk -v v_user="$gitUsername" \ - -v v_email="$gitEmail" \ - -v v_host="$hostName" \ - -v v_gpu="$profile" \ - -v v_kb="$keyboardLayout" \ - -v v_kv="$keyboardVariant" \ - -v v_ckm="$consoleKeyMap" \ - -f /dev/stdin ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix <<'AWK' +# Write AWK program to a temporary file to avoid any shell parsing edge cases +awk_prog=$(mktemp) +cat > "$awk_prog" <<'AWK' BEGIN { in_block=0 } /zaneyos[[:space:]]*=[[:space:]]*\{/ { in_block=1 } in_block && /gitUsername[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_user "\"") } @@ -435,6 +430,15 @@ in_block && /consoleKeyMap[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, " !in_block && /^[[:space:]]*consoleKeyMap[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_ckm "\"") } { print } AWK +awk -v v_user="$gitUsername" \ + -v v_email="$gitEmail" \ + -v v_host="$hostName" \ + -v v_gpu="$profile" \ + -v v_kb="$keyboardLayout" \ + -v v_kv="$keyboardVariant" \ + -v v_ckm="$consoleKeyMap" \ + -f "$awk_prog" ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix +rm -f "$awk_prog" rm ./hosts/$hostName/variables.nix.bak echo "Configuration files updated successfully!" From 6b71f5ae815bc887a9407bee263ad57397ebec28 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 14:02:22 -0500 Subject: [PATCH 015/232] going back to SED AWK not working On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh --- install-zaneyos.sh | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index fb76a6a..36f7206 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -408,37 +408,23 @@ rm ./modules/core/system.nix.bak # Update variables in host file; support both old style and new zaneyos options block cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak -# Write AWK program to a temporary file to avoid any shell parsing edge cases -awk_prog=$(mktemp) -cat > "$awk_prog" <<'AWK' -BEGIN { in_block=0 } -/zaneyos[[:space:]]*=[[:space:]]*\{/ { in_block=1 } -in_block && /gitUsername[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_user "\"") } -in_block && /gitEmail[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_email "\"") } -in_block && /hostName[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_host "\"") } -in_block && /gpuProfile[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_gpu "\"") } -in_block && /keyboardLayout[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kb "\"") } -in_block && /keyboardVariant[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kv "\"") } -in_block && /consoleKeyMap[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_ckm "\"") } -/\};/ && in_block { in_block=0 } +# Use sed-based replacements to avoid awk/shell quoting issues +esc() { printf '%s' "$1" | sed -e 's/[\/&]/\\&/g'; } +v_user=$(esc "$gitUsername") +v_email=$(esc "$gitEmail") +v_host=$(esc "$hostName") +v_gpu=$(esc "$profile") +v_kb=$(esc "$keyboardLayout") +v_kv=$(esc "$keyboardVariant") +v_ckm=$(esc "$consoleKeyMap") -# Fallback for old style top-level keys -!in_block && /^[[:space:]]*gitUsername[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_user "\"") } -!in_block && /^[[:space:]]*gitEmail[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_email "\"") } -!in_block && /^[[:space:]]*keyboardLayout[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kb "\"") } -!in_block && /^[[:space:]]*keyboardVariant[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_kv "\"") } -!in_block && /^[[:space:]]*consoleKeyMap[[:space:]]*=[[:space:]]*"[^"]*"/ { sub(/"[^"]*"/, "\"" v_ckm "\"") } -{ print } -AWK -awk -v v_user="$gitUsername" \ - -v v_email="$gitEmail" \ - -v v_host="$hostName" \ - -v v_gpu="$profile" \ - -v v_kb="$keyboardLayout" \ - -v v_kv="$keyboardVariant" \ - -v v_ckm="$consoleKeyMap" \ - -f "$awk_prog" ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix -rm -f "$awk_prog" +sed -i -E "s|(^[[:space:]]*gitUsername[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_user}\2|" ./hosts/$hostName/variables.nix +sed -i -E "s|(^[[:space:]]*gitEmail[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_email}\2|" ./hosts/$hostName/variables.nix +sed -i -E "s|(^[[:space:]]*hostName[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_host}\2|" ./hosts/$hostName/variables.nix +sed -i -E "s|(^[[:space:]]*gpuProfile[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_gpu}\2|" ./hosts/$hostName/variables.nix +sed -i -E "s|(^[[:space:]]*keyboardLayout[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_kb}\2|" ./hosts/$hostName/variables.nix +sed -i -E "s|(^[[:space:]]*keyboardVariant[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_kv}\2|" ./hosts/$hostName/variables.nix +sed -i -E "s|(^[[:space:]]*consoleKeyMap[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_ckm}\2|" ./hosts/$hostName/variables.nix rm ./hosts/$hostName/variables.nix.bak echo "Configuration files updated successfully!" From 4efeb4b4cbd62091471f2a3d3a6a1f5d8db83430 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 14:04:03 -0500 Subject: [PATCH 016/232] SED attempt #2 On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh --- install-zaneyos.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 36f7206..f13d625 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -409,7 +409,7 @@ rm ./modules/core/system.nix.bak # Update variables in host file; support both old style and new zaneyos options block cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak # Use sed-based replacements to avoid awk/shell quoting issues -esc() { printf '%s' "$1" | sed -e 's/[\/&]/\\&/g'; } +esc() { printf '%s' "$1" | sed -e 's/[\/&|]/\\&/g'; } v_user=$(esc "$gitUsername") v_email=$(esc "$gitEmail") v_host=$(esc "$hostName") @@ -418,13 +418,13 @@ v_kb=$(esc "$keyboardLayout") v_kv=$(esc "$keyboardVariant") v_ckm=$(esc "$consoleKeyMap") -sed -i -E "s|(^[[:space:]]*gitUsername[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_user}\2|" ./hosts/$hostName/variables.nix -sed -i -E "s|(^[[:space:]]*gitEmail[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_email}\2|" ./hosts/$hostName/variables.nix -sed -i -E "s|(^[[:space:]]*hostName[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_host}\2|" ./hosts/$hostName/variables.nix -sed -i -E "s|(^[[:space:]]*gpuProfile[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_gpu}\2|" ./hosts/$hostName/variables.nix -sed -i -E "s|(^[[:space:]]*keyboardLayout[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_kb}\2|" ./hosts/$hostName/variables.nix -sed -i -E "s|(^[[:space:]]*keyboardVariant[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_kv}\2|" ./hosts/$hostName/variables.nix -sed -i -E "s|(^[[:space:]]*consoleKeyMap[[:space:]]*=[[:space:]]*")[^"]*(";)|\1${v_ckm}\2|" ./hosts/$hostName/variables.nix +sed -i -E 's|(^[[:space:]]*gitUsername[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_user}"'\2|' ./hosts/$hostName/variables.nix +sed -i -E 's|(^[[:space:]]*gitEmail[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_email}"'\2|' ./hosts/$hostName/variables.nix +sed -i -E 's|(^[[:space:]]*hostName[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_host}"'\2|' ./hosts/$hostName/variables.nix +sed -i -E 's|(^[[:space:]]*gpuProfile[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_gpu}"'\2|' ./hosts/$hostName/variables.nix +sed -i -E 's|(^[[:space:]]*keyboardLayout[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_kb}"'\2|' ./hosts/$hostName/variables.nix +sed -i -E 's|(^[[:space:]]*keyboardVariant[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_kv}"'\2|' ./hosts/$hostName/variables.nix +sed -i -E 's|(^[[:space:]]*consoleKeyMap[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_ckm}"'\2|' ./hosts/$hostName/variables.nix rm ./hosts/$hostName/variables.nix.bak echo "Configuration files updated successfully!" From e219557b38e511c3544c72a8493e35e8499bb73a Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 14:07:51 -0500 Subject: [PATCH 017/232] Trying python On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh --- install-zaneyos.sh | 49 +++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index f13d625..5a75ccf 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -408,23 +408,40 @@ rm ./modules/core/system.nix.bak # Update variables in host file; support both old style and new zaneyos options block cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak -# Use sed-based replacements to avoid awk/shell quoting issues -esc() { printf '%s' "$1" | sed -e 's/[\/&|]/\\&/g'; } -v_user=$(esc "$gitUsername") -v_email=$(esc "$gitEmail") -v_host=$(esc "$hostName") -v_gpu=$(esc "$profile") -v_kb=$(esc "$keyboardLayout") -v_kv=$(esc "$keyboardVariant") -v_ckm=$(esc "$consoleKeyMap") -sed -i -E 's|(^[[:space:]]*gitUsername[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_user}"'\2|' ./hosts/$hostName/variables.nix -sed -i -E 's|(^[[:space:]]*gitEmail[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_email}"'\2|' ./hosts/$hostName/variables.nix -sed -i -E 's|(^[[:space:]]*hostName[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_host}"'\2|' ./hosts/$hostName/variables.nix -sed -i -E 's|(^[[:space:]]*gpuProfile[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_gpu}"'\2|' ./hosts/$hostName/variables.nix -sed -i -E 's|(^[[:space:]]*keyboardLayout[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_kb}"'\2|' ./hosts/$hostName/variables.nix -sed -i -E 's|(^[[:space:]]*keyboardVariant[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_kv}"'\2|' ./hosts/$hostName/variables.nix -sed -i -E 's|(^[[:space:]]*consoleKeyMap[[:space:]]*=[[:space:]]*")[^"]*(";)|\1'"${v_ckm}"'\2|' ./hosts/$hostName/variables.nix +# Use Python for robust, quote-safe updates (avoids shell/sed escaping pitfalls) +GIT_USERNAME="$gitUsername" +GIT_EMAIL="$gitEmail" +HOST_NAME="$hostName" +GPU_PROFILE="$profile" +KB_LAYOUT="$keyboardLayout" +KB_VARIANT="$keyboardVariant" +CONSOLE_KEYMAP="$consoleKeyMap" + +python3 - <<'PY' +import os, re, pathlib, sys +hn = os.environ['HOST_NAME'] +path = pathlib.Path(f'./hosts/{hn}/variables.nix') +text = path.read_text(encoding='utf-8') + +pairs = [ + ('gitUsername', os.environ['GIT_USERNAME']), + ('gitEmail', os.environ['GIT_EMAIL']), + ('hostName', os.environ['HOST_NAME']), + ('gpuProfile', os.environ['GPU_PROFILE']), + ('keyboardLayout', os.environ['KB_LAYOUT']), + ('keyboardVariant', os.environ['KB_VARIANT']), + ('consoleKeyMap', os.environ['CONSOLE_KEYMAP']), +] + +for key, val in pairs: + # Replace both in-block and top-level lines of the form: key = "..."; + pat = re.compile(rf'^(\s*{re.escape(key)}\s*=\s*")[^"]*(";\s*)$', flags=re.M) + text = pat.sub(lambda m, v=val: m.group(1) + v + m.group(2), text) + +path.write_text(text, encoding='utf-8') +PY + rm ./hosts/$hostName/variables.nix.bak echo "Configuration files updated successfully!" From c9cae4f3ae0542524ff3242f70ad87190fe59313 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 14:16:12 -0500 Subject: [PATCH 018/232] Moved editing variables to own script On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh new file: scripts/update_vars.py --- install-zaneyos.sh | 40 ++++++----------------------------- scripts/update_vars.py | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 34 deletions(-) create mode 100644 scripts/update_vars.py diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 5a75ccf..caf9789 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -408,40 +408,12 @@ rm ./modules/core/system.nix.bak # Update variables in host file; support both old style and new zaneyos options block cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak - -# Use Python for robust, quote-safe updates (avoids shell/sed escaping pitfalls) -GIT_USERNAME="$gitUsername" -GIT_EMAIL="$gitEmail" -HOST_NAME="$hostName" -GPU_PROFILE="$profile" -KB_LAYOUT="$keyboardLayout" -KB_VARIANT="$keyboardVariant" -CONSOLE_KEYMAP="$consoleKeyMap" - -python3 - <<'PY' -import os, re, pathlib, sys -hn = os.environ['HOST_NAME'] -path = pathlib.Path(f'./hosts/{hn}/variables.nix') -text = path.read_text(encoding='utf-8') - -pairs = [ - ('gitUsername', os.environ['GIT_USERNAME']), - ('gitEmail', os.environ['GIT_EMAIL']), - ('hostName', os.environ['HOST_NAME']), - ('gpuProfile', os.environ['GPU_PROFILE']), - ('keyboardLayout', os.environ['KB_LAYOUT']), - ('keyboardVariant', os.environ['KB_VARIANT']), - ('consoleKeyMap', os.environ['CONSOLE_KEYMAP']), -] - -for key, val in pairs: - # Replace both in-block and top-level lines of the form: key = "..."; - pat = re.compile(rf'^(\s*{re.escape(key)}\s*=\s*")[^"]*(";\s*)$', flags=re.M) - text = pat.sub(lambda m, v=val: m.group(1) + v + m.group(2), text) - -path.write_text(text, encoding='utf-8') -PY - +python3 ./scripts/update_vars.py "./hosts/$hostName/variables.nix" \ + "$gitUsername" "$gitEmail" "$hostName" "$profile" "$keyboardLayout" "$keyboardVariant" "$consoleKeyMap" || { + print_error "Failed to update hosts/$hostName/variables.nix"; + echo "Check the file exists and the script at ./scripts/update_vars.py is present."; + exit 1; +} rm ./hosts/$hostName/variables.nix.bak echo "Configuration files updated successfully!" diff --git a/scripts/update_vars.py b/scripts/update_vars.py new file mode 100644 index 0000000..4155468 --- /dev/null +++ b/scripts/update_vars.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python3 +import sys +import re +import pathlib + +def main() -> int: + if len(sys.argv) != 9: + print( + "usage: update_vars.py ", + file=sys.stderr, + ) + return 2 + + file_path = pathlib.Path(sys.argv[1]) + values = sys.argv[2:] + keys = [ + "gitUsername", + "gitEmail", + "hostName", + "gpuProfile", + "keyboardLayout", + "keyboardVariant", + "consoleKeyMap", + ] + + try: + text = file_path.read_text(encoding="utf-8") + except Exception as e: + print(f"error: unable to read {file_path}: {e}", file=sys.stderr) + return 1 + + for key, val in zip(keys, values): + # Replace lines of the form: key = "..."; + # Works whether the line is top-level or inside a block + pattern = re.compile(rf'^(\s*{re.escape(key)}\s*=\s*")[^"]*(";\s*)$', re.M) + text = pattern.sub(lambda m, v=val: m.group(1) + v + m.group(2), text) + + try: + file_path.write_text(text, encoding="utf-8") + except Exception as e: + print(f"error: unable to write {file_path}: {e}", file=sys.stderr) + return 1 + + return 0 + +if __name__ == "__main__": + raise SystemExit(main()) From 049f569bcbc83cac6c0e29a892481c0bc77b319c Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 14:20:12 -0500 Subject: [PATCH 019/232] Removed REPLACE banner and fixed bash script error On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh --- install-zaneyos.sh | 45 +++++++-------------------------------------- 1 file changed, 7 insertions(+), 38 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index caf9789..80ff8d8 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -197,43 +197,12 @@ Please type out your choice: " profile echo -e "${GREEN}Selected GPU profile: $profile${NC}" fi -print_header "⚠️ CRITICAL WARNING - Existing ZaneyOS Detected" +print_header "Repository Setup" backupname=$(date +"%Y-%m-%d-%H-%M-%S") -if [ -d "zaneyos" ]; then - echo -e "${RED}╔═══════════════════════════════════════════════════════════════════════╗${NC}" - echo -e "${RED}║ ⚠️ IMPORTANT WARNING ⚠️ ║${NC}" - echo -e "${RED}║ ║${NC}" - echo -e "${RED}║ An existing ZaneyOS installation was detected at ~/zaneyos ║${NC}" - echo -e "${RED}║ ║${NC}" - echo -e "${RED}║ This installer will COMPLETELY REPLACE your existing configuration! ║${NC}" - echo -e "${RED}║ All customizations, packages, and settings will be LOST! ║${NC}" - echo -e "${RED}║ ║${NC}" - echo -e "${RED}║ ** A backup copy of your config will be created ** ║${NC}" - echo -e "${RED}║ * You will have to merge your changes back ** ║${NC}" - echo -e "${RED}║ ║${NC}" - echo -e "${RED}╚═══════════════════════════════════════════════════════════════════════╝${NC}" - echo "" - echo -e "${YELLOW}If you REALLY want to do a fresh installation (losing all customizations):${NC}" - read -p "Type 'REPLACE' to continue with fresh install or Ctrl+C to cancel: " confirmation - if [ "$confirmation" != "REPLACE" ]; then - echo -e "${GREEN}Installation cancelled. ${NC}" - exit 0 - fi - echo -e "${GREEN}zaneyos exists, backing up to .config/zaneyos-backups folder.${NC}" - if [ -d ".config/zaneyos-backups" ]; then - echo -e "${GREEN}Moving current version of ZaneyOS to backups folder.${NC}" - mv "$HOME"/zaneyos .config/zaneyos-backups/"$backupname" - sleep 1 - else - echo -e "${GREEN}Creating the backups folder & moving ZaneyOS to it.${NC}" - mkdir -p .config/zaneyos-backups - mv "$HOME"/zaneyos .config/zaneyos-backups/"$backupname" - sleep 1 - fi -else - echo -e "${GREEN}Thank you for choosing ZaneyOS.${NC}" - echo -e "${GREEN}I hope you find your time here enjoyable!${NC}" +if [ -d "$HOME/zaneyos" ]; then + echo -e "${YELLOW}Backing up existing zaneyos-${backupname}${NC}" + mv "$HOME/zaneyos" "$HOME/zaneyos-${backupname}" fi print_header "Cloning ZaneyOS Repository" @@ -432,9 +401,9 @@ print_header "Setting Nix Configuration" NIX_CONFIG="experimental-features = nix-command flakes" print_header "Initiating NixOS Build" -read -p "Ready to run initial build? (Y/N): " -n 1 -r -echo -if [[ ! $REPLY =~ ^[Yy]$ ]]; then +printf "%s" "Ready to run initial build? [y/N]: " +read -r REPLY +if ! [[ "$REPLY" =~ ^[Yy]$ ]]; then echo -e "${RED}Build cancelled.${NC}" exit 1 fi From f67aa577a69f910c9fed88825b8d9e404178af3d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 14:24:18 -0500 Subject: [PATCH 020/232] Hopefully last bash error On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh --- install-zaneyos.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 80ff8d8..4789725 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -324,7 +324,8 @@ echo "" print_summary "$hostName" "$profile" "$installusername" "$timezone" "$keyboardLayout" "$keyboardVariant" "$consoleKeyMap" echo "" echo -e "${YELLOW}Please review the configuration above.${NC}" -read -p "$(echo -e "${YELLOW}Continue with installation? (Y/N): ${NC}")" -n 1 -r +printf "%s" "${YELLOW}Continue with installation? (Y/N): ${NC}" +read -r REPLY echo if [[ ! $REPLY =~ ^[Yy]$ ]]; then echo -e "${RED}Installation cancelled.${NC}" @@ -370,9 +371,9 @@ grep -E "username\s*=|^\s*hosts\s*=|^\s*\"[^"]+\"$|^\s*\];$" -n ./flake.nix | se # Update timezone in system.nix cp ./modules/core/system.nix ./modules/core/system.nix.bak -# Escape sed-sensitive chars in timezone (e.g., & and |) -tz_safe=$(printf '%s' "$timezone" | sed 's/[&|]/\\&/g') -sed -i -E 's|^ time\.timeZone = ".*";| time.timeZone = '"\"$tz_safe\""';|' ./modules/core/system.nix +# Escape sed-sensitive chars in timezone (e.g., /, &, |) +tz_safe=$(printf '%s' "$timezone" | sed 's/[\/&|]/\\&/g') +sed -i -E "s|^ time\\.timeZone = \".*\";| time.timeZone = \"${tz_safe}\";|" ./modules/core/system.nix rm ./modules/core/system.nix.bak # Update variables in host file; support both old style and new zaneyos options block From b5da1d723bfc7f63bb7a11a3dfd5cafc9825248e Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 14:30:04 -0500 Subject: [PATCH 021/232] Moving more functions to python On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh new file: scripts/update_timezone.py --- install-zaneyos.sh | 13 +++++++------ scripts/update_timezone.py | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 scripts/update_timezone.py diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 4789725..ece52df 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -349,7 +349,7 @@ echo " profile: $profile" cp ./flake.nix ./flake.nix.bak # 1) Update username if present -sed -i 's|^[[:space:]]*username[[:space:]]*=[[:space:]]*"[^"]*";| username = "'$installusername'";|' ./flake.nix +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" ' @@ -367,13 +367,14 @@ awk -v h="$hostName" ' # Show summary of effective username and hosts list lines echo -e "${GREEN}After flake updates:${NC}" -grep -E "username\s*=|^\s*hosts\s*=|^\s*\"[^"]+\"$|^\s*\];$" -n ./flake.nix | sed -n '/hosts = \[/,/];/p' +grep -E 'username\s*=|^\s*hosts\s*=|^\s*"[^"]+"$|^\s*\];$' -n ./flake.nix | sed -n '/hosts = \[/,/];/p' -# Update timezone in system.nix +# Update timezone in system.nix (robust quoting via Python helper) cp ./modules/core/system.nix ./modules/core/system.nix.bak -# Escape sed-sensitive chars in timezone (e.g., /, &, |) -tz_safe=$(printf '%s' "$timezone" | sed 's/[\/&|]/\\&/g') -sed -i -E "s|^ time\\.timeZone = \".*\";| time.timeZone = \"${tz_safe}\";|" ./modules/core/system.nix +python3 ./scripts/update_timezone.py ./modules/core/system.nix "$timezone" || { + print_error "Failed to update time.timeZone in modules/core/system.nix"; + exit 1; +} rm ./modules/core/system.nix.bak # Update variables in host file; support both old style and new zaneyos options block diff --git a/scripts/update_timezone.py b/scripts/update_timezone.py new file mode 100644 index 0000000..fec9eae --- /dev/null +++ b/scripts/update_timezone.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 +import sys +import re +from pathlib import Path + +def main() -> int: + if len(sys.argv) != 3: + print("usage: update_timezone.py ", file=sys.stderr) + return 2 + path = Path(sys.argv[1]) + tz = sys.argv[2] + try: + text = path.read_text(encoding="utf-8") + except Exception as e: + print(f"error: unable to read {path}: {e}", file=sys.stderr) + return 1 + + pattern = re.compile(r'^(\s*time\.timeZone\s*=\s*")[^"]*(";\s*)$', re.M) + new_text, n = pattern.subn(lambda m: m.group(1) + tz + m.group(2), text, count=1) + + if n == 0: + print("warning: did not find a time.timeZone line to update", file=sys.stderr) + return 0 + + try: + path.write_text(new_text, encoding="utf-8") + except Exception as e: + print(f"error: unable to write {path}: {e}", file=sys.stderr) + return 1 + + return 0 + +if __name__ == "__main__": + raise SystemExit(main()) From 5a0c24742a47033e4ba0d9a2dfe7b6d30937236b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 14:39:34 -0500 Subject: [PATCH 022/232] removed helium brings in X11 pkgs. Fixed summary info before install starts On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh modified: modules/core/overlays.nix modified: modules/core/packages.nix modified: modules/home/waybar/waybar-jak-catppuccin.nix modified: modules/home/waybar/waybar-jak-ml4w-modern.nix modified: modules/home/waybar/waybar-jak-oglo-simple.nix deleted: pkgs/helium/default.nix --- install-zaneyos.sh | 35 ++++++------ modules/core/overlays.nix | 7 +-- modules/core/packages.nix | 1 - modules/home/waybar/waybar-jak-catppuccin.nix | 2 - .../home/waybar/waybar-jak-ml4w-modern.nix | 2 - .../home/waybar/waybar-jak-oglo-simple.nix | 1 - pkgs/helium/default.nix | 53 ------------------- 7 files changed, 17 insertions(+), 84 deletions(-) delete mode 100644 pkgs/helium/default.nix diff --git a/install-zaneyos.sh b/install-zaneyos.sh index ece52df..ce5bd00 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -28,19 +28,22 @@ print_header() { echo -e "${GREEN}╚═══════════════════════════════════════════════════════════════════════╝${NC}" } -# Function to print a configuration summary +# Function to print a configuration summary (robust formatting) print_summary() { - echo -e "${CYAN}╔═══════════════════════════════════════════════════════════════════════╗${NC}" - echo -e "${CYAN}║ 📋 Installation Configuration Summary ║${NC}" - echo -e "${CYAN}╠═══════════════════════════════════════════════════════════════════════╣${NC}" - echo -e "${CYAN}║ 🖥️ Hostname: ${BLUE}${1}${NC}" - echo -e "${CYAN}║ 🎮 GPU Profile: ${BLUE}${2}${NC}" - echo -e "${CYAN}║ 👤 System Username: ${BLUE}${3}${NC}" - echo -e "${CYAN}║ 🌐 Timezone: ${BLUE}${4}${NC}" - echo -e "${CYAN}║ ⌨️ Keyboard Layout: ${BLUE}${5}${NC}" - echo -e "${CYAN}║ ⌨️ Keyboard Variant: ${BLUE}${6:-none}${NC}" - echo -e "${CYAN}║ 🖥️ Console Keymap: ${BLUE}${7:-$5}${NC}" - echo -e "${CYAN}╚═══════════════════════════════════════════════════════════════════════╝${NC}" + local hostname="$1" profile="$2" user="$3" tz="$4" layout="$5" variant="$6" console="$7" + local v + v="${variant:-none}" + printf "%b\n" "${CYAN}╔═══════════════════════════════════════════════════════════════════════╗${NC}" + printf "%b\n" "${CYAN}║ 📋 Installation Configuration Summary ║${NC}" + printf "%b\n" "${CYAN}╠═══════════════════════════════════════════════════════════════════════╣${NC}" + printf "%b\n" "${CYAN}║ 🖥️ Hostname: ${BLUE}${hostname}${NC}" + printf "%b\n" "${CYAN}║ 🎮 GPU Profile: ${BLUE}${profile}${NC}" + printf "%b\n" "${CYAN}║ 👤 System Username: ${BLUE}${user}${NC}" + printf "%b\n" "${CYAN}║ 🌐 Timezone: ${BLUE}${tz}${NC}" + printf "%b\n" "${CYAN}║ ⌨️ Keyboard Layout: ${BLUE}${layout}${NC}" + printf "%b\n" "${CYAN}║ ⌨️ Keyboard Variant: ${BLUE}${v}${NC}" + printf "%b\n" "${CYAN}║ 🖥️ Console Keymap: ${BLUE}${console:-$layout}${NC}" + printf "%b\n" "${CYAN}╚═══════════════════════════════════════════════════════════════════════╝${NC}" } # Function to print an error message @@ -336,14 +339,6 @@ 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 cp ./flake.nix ./flake.nix.bak diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index 0535e35..9d20b7c 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -3,10 +3,7 @@ # Provide pkgs.google-antigravity via antigravity-nix overlay inputs.antigravity-nix.overlays.default - # Local packages overlay - (final: prev: { - # Helium browser (AppImage wrapped) - helium = prev.callPackage ../../pkgs/helium { }; - }) +# Local packages overlay (empty) + (final: prev: { }) ]; } diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 281474d..4043b5c 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -45,7 +45,6 @@ in { amfora # Fancy Terminal Browser For Gemini Protocol appimage-run # Needed For AppImage Support brave # Brave Browser - helium # Helium browser brightnessctl # For Screen Brightness Control cliphist # Clipboard manager using rofi menu cmatrix # Matrix Movie Effect In Terminal diff --git a/modules/home/waybar/waybar-jak-catppuccin.nix b/modules/home/waybar/waybar-jak-catppuccin.nix index aaa5e29..6693d56 100644 --- a/modules/home/waybar/waybar-jak-catppuccin.nix +++ b/modules/home/waybar/waybar-jak-catppuccin.nix @@ -444,13 +444,11 @@ in { "window-rewrite" = { "title<.*amazon.*>" = " "; "title<.*reddit.*>" = " "; - "title<.*[Hh]elium.*>" = " "; "class" = " "; "class" = "󰰷 "; "class" = " "; "class" = " "; "class" = " "; - "class" = " "; "class" = "🦁 "; "class" = " "; "class" = "🦊 "; diff --git a/modules/home/waybar/waybar-jak-ml4w-modern.nix b/modules/home/waybar/waybar-jak-ml4w-modern.nix index 0074853..80068a9 100644 --- a/modules/home/waybar/waybar-jak-ml4w-modern.nix +++ b/modules/home/waybar/waybar-jak-ml4w-modern.nix @@ -727,14 +727,12 @@ in { "window-rewrite" = { "title<.*amazon.*>" = " "; "title<.*reddit.*>" = " "; - "title<.*[Hh]elium.*>" = " "; "class" = " "; "class" = "󰰷 "; "class" = " "; "class" = " "; "class" = " "; - "class" = " "; "class" = "🦁 "; "class" = " "; "class" = "🦊 "; diff --git a/modules/home/waybar/waybar-jak-oglo-simple.nix b/modules/home/waybar/waybar-jak-oglo-simple.nix index d84c8e3..ccad11c 100644 --- a/modules/home/waybar/waybar-jak-oglo-simple.nix +++ b/modules/home/waybar/waybar-jak-oglo-simple.nix @@ -594,7 +594,6 @@ in { "class" = "󰰭 "; "class" = " 󰊠"; "class" = " "; - "class" = " "; "class<[Ss]ignal|signal-desktop|org.signal.Signal>" = "󰍩 "; "title<.*Signal.*>" = "󰍩 "; "class" = "🖥️ "; diff --git a/pkgs/helium/default.nix b/pkgs/helium/default.nix deleted file mode 100644 index ffe5dfc..0000000 --- a/pkgs/helium/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, fetchurl, appimageTools }: - -let - pname = "helium"; - # Pick a known Linux AppImage release; bump as needed. - version = "0.6.2.1"; - src = fetchurl { - url = "https://github.com/imputnet/helium-linux/releases/download/${version}/helium-${version}-x86_64.AppImage"; - sha256 = "1ngsxh4r7c4gmhxhimhwrr9bw8z8zdg02qw3vw3rkwbhbxxf0m7p"; - }; - contents = appimageTools.extractType2 { inherit pname version src; }; - -in appimageTools.wrapType2 { - inherit pname version src; - - # AppImages usually bundle their libs, but add a few common ones just in case. - extraPkgs = pkgs: with pkgs; [ - # graphics / input - libglvnd libdrm libgbm - libX11 libXcursor libXrender libXext libXtst libXi libXrandr libXScrnSaver - libxkbcommon wayland - # gtk stack - glib gtk3 - # audio / printing / notifications - alsa-lib libpulseaudio libnotify cups - # nss - nspr nss - # tray icon support - libappindicator-gtk3 at-spi2-atk at-spi2-core - ]; - - extraInstallCommands = '' - # Try to install desktop file and icon from the AppImage, if present. - if [ -f ${contents}/helium.desktop ]; then - install -Dm444 ${contents}/helium.desktop $out/share/applications/helium.desktop - substituteInPlace $out/share/applications/helium.desktop \ - --replace 'Exec=AppRun' 'Exec=helium' - fi - if [ -f ${contents}/helium.png ]; then - install -Dm444 ${contents}/helium.png $out/share/icons/hicolor/512x512/apps/helium.png - elif [ -f ${contents}/helium.svg ]; then - install -Dm444 ${contents}/helium.svg $out/share/icons/hicolor/scalable/apps/helium.svg - fi - ''; - - meta = with lib; { - description = "Private, fast, and honest web browser (AppImage wrapped)"; - homepage = "https://helium.computer/"; - license = licenses.gpl3Only; - platforms = [ "x86_64-linux" ]; - maintainers = []; - }; -} From 490f46da09400b13c30b03b36dba0425c7afba08 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 14:43:37 -0500 Subject: [PATCH 023/232] Small formatting error and removed old error msg On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh --- install-zaneyos.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index ce5bd00..dd68e4e 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -327,7 +327,7 @@ echo "" print_summary "$hostName" "$profile" "$installusername" "$timezone" "$keyboardLayout" "$keyboardVariant" "$consoleKeyMap" echo "" echo -e "${YELLOW}Please review the configuration above.${NC}" -printf "%s" "${YELLOW}Continue with installation? (Y/N): ${NC}" +printf "%b" "${YELLOW}Continue with installation? (Y/N): ${NC}" read -r REPLY echo if [[ ! $REPLY =~ ^[Yy]$ ]]; then @@ -360,9 +360,7 @@ awk -v h="$hostName" ' { print } ' ./flake.nix > ./flake.nix.tmp && mv ./flake.nix.tmp ./flake.nix -# Show summary of effective username and hosts list lines -echo -e "${GREEN}After flake updates:${NC}" -grep -E 'username\s*=|^\s*hosts\s*=|^\s*"[^"]+"$|^\s*\];$' -n ./flake.nix | sed -n '/hosts = \[/,/];/p' +# (quiet) flake updated # Update timezone in system.nix (robust quoting via Python helper) cp ./modules/core/system.nix ./modules/core/system.nix.bak @@ -391,7 +389,7 @@ git add . git config --global --unset-all user.name git config --global --unset-all user.email -print_header "Generating Hardware Configuration -- Ignore ERROR: cannot access /bin" +print_header "Generating Hardware Configuration" sudo nixos-generate-config --show-hardware-config >./hosts/$hostName/hardware.nix print_header "Setting Nix Configuration" From c83e8a504e66817c0febbbef66ef1f1460f36bda Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 15:07:21 -0500 Subject: [PATCH 024/232] Updating ZCLI to use new host paradigm not GPU On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/scripts/zcli.nix --- modules/home/scripts/zcli.nix | 121 ++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 49 deletions(-) diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index b310d41..6ffb42c 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -90,7 +90,7 @@ in # Purpose: NixOS system management utility for ZaneyOS distribution # Author: Don Williams (ddubs) & Zaney # Start Date: June 7th, 2025 - # Version: 1.0.2 + # Version: 1.0.3 # # Architecture: # - Nix-generated shell script using writeShellScriptBin @@ -129,48 +129,29 @@ in # --- Configuration --- - PROJECT="zaneyos" #ddubos or zaneyos - PROFILE="${zaneyos.hostName}" + PROJECT="zaneyos" # ddubos or zaneyos + VERSION="1.0.3" BACKUP_FILES_STR="${backupFilesString}" - VERSION="1.0.2" - FLAKE_NIX_PATH="$HOME/$PROJECT/flake.nix" + FLAKE_DIR="$HOME/$PROJECT" + FLAKE_NIX_PATH="$FLAKE_DIR/flake.nix" read -r -a BACKUP_FILES <<< "$BACKUP_FILES_STR" # --- Helper Functions --- verify_hostname() { local current_hostname - local flake_hostname + current_hostname="$(${pkgs.nettools}/bin/hostname)" - current_hostname="$(hostname)" - - # Extract the host value from flake.nix - if [ -f "$FLAKE_NIX_PATH" ]; then - flake_hostname=$(${pkgs.gnugrep}/bin/grep -E '^[[:space:]]*host[[:space:]]*=' "$FLAKE_NIX_PATH" | ${pkgs.gnused}/bin/sed 's/.*=[[:space:]]*"\([^"]*\)".*/\1/') - - if [ -z "$flake_hostname" ]; then - echo "Error: Could not find 'host' variable in $FLAKE_NIX_PATH" >&2 - exit 1 - fi - - if [ "$current_hostname" != "$flake_hostname" ]; then - echo "Error: Hostname mismatch!" >&2 - echo " Current hostname: '$current_hostname'" >&2 - echo " Flake.nix host: '$flake_hostname'" >&2 - echo "" >&2 - echo "Hint: Run 'zcli update-host' to automatically update flake.nix" >&2 - echo " or manually edit $FLAKE_NIX_PATH" >&2 - exit 1 - fi - else + if [ ! -f "$FLAKE_NIX_PATH" ]; then echo "Error: Flake.nix not found at $FLAKE_NIX_PATH" >&2 exit 1 fi - # Also check if host folder exists - local folder="$HOME/$PROJECT/hosts/$current_hostname" + # Check if a matching host folder exists under hosts/ + local folder="$FLAKE_DIR/hosts/$current_hostname" if [ ! -d "$folder" ]; then - echo "Error: Matching host not found in $PROJECT, Missing folder: $folder" >&2 + echo "Error: Matching host not found in $PROJECT. Missing: $folder" >&2 + echo "Hint: Run 'zcli update-host' to create it (copies hosts/default) or run 'zcli update-host $current_hostname '." >&2 exit 1 fi } @@ -335,6 +316,19 @@ 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 + } + # --- Main Logic --- if [ "$#" -eq 0 ]; then echo "Error: No command provided." >&2 @@ -394,8 +388,14 @@ in # Parse additional arguments extra_args=$(parse_nh_args "$@") - echo "Starting NixOS rebuild for host: $(${pkgs.nettools}/bin/hostname)" - if eval "${pkgs.nh}/bin/nh os switch --diff always --hostname '$PROFILE' $extra_args"; then + target="$(get_nh_target)" + if [ -z "$target" ]; then + echo "Error: Could not resolve flake config (no hosts/$(${pkgs.nettools}/bin/hostname) or hosts/default)." >&2 + exit 1 + fi + + echo "Starting NixOS rebuild for config: $target" + if eval "${pkgs.nh}/bin/nh os switch --diff always --hostname \"$target\" $extra_args"; then echo "Rebuild finished successfully" else echo "Rebuild Failed" >&2 @@ -409,9 +409,15 @@ in # Parse additional arguments extra_args=$(parse_nh_args "$@") - echo "Starting NixOS rebuild (boot) for host: $(${pkgs.nettools}/bin/hostname)" + target="$(get_nh_target)" + if [ -z "$target" ]; then + echo "Error: Could not resolve flake config (no hosts/$(${pkgs.nettools}/bin/hostname) or hosts/default)." >&2 + exit 1 + fi + + echo "Starting NixOS rebuild (boot) for config: $target" echo "Note: Configuration will be activated on next reboot" - if eval "${pkgs.nh}/bin/nh os boot --diff always --hostname '$PROFILE' $extra_args"; then + if eval "${pkgs.nh}/bin/nh os boot --diff always --hostname \"$target\" $extra_args"; then echo "Rebuild-boot finished successfully" echo "New configuration set as boot default - restart to activate" else @@ -438,8 +444,14 @@ in # Parse additional arguments extra_args=$(parse_nh_args "$@") - echo "Updating flake and rebuilding system for host: $(${pkgs.nettools}/bin/hostname)" - if eval "${pkgs.nh}/bin/nh os switch --diff always --hostname '$PROFILE' --update $extra_args"; then + target="$(get_nh_target)" + if [ -z "$target" ]; then + echo "Error: Could not resolve flake config (no hosts/$(${pkgs.nettools}/bin/hostname) or hosts/default)." >&2 + exit 1 + fi + + echo "Updating flake and rebuilding system for config: $target" + if eval "${pkgs.nh}/bin/nh os switch --diff always --hostname \"$target\" --update $extra_args"; then echo "Update and rebuild finished successfully" else echo "Update and rebuild Failed" >&2 @@ -471,25 +483,31 @@ in exit 1 fi - echo "Updating $FLAKE_NIX_PATH..." + echo "Preparing host '$target_hostname' (profile: $target_profile)..." - # Update host - if ${pkgs.gnused}/bin/sed -i "s/^[[:space:]]*host[[:space:]]*=[[:space:]]*\".*\"/ host = \"$target_hostname\"/" "$FLAKE_NIX_PATH"; then - echo "Successfully updated host to: $target_hostname" + # Ensure host directory exists (copy from hosts/default if missing) + if [ ! -d "$FLAKE_DIR/hosts/$target_hostname" ]; then + echo "Creating $FLAKE_DIR/hosts/$target_hostname from hosts/default..." + ${pkgs.coreutils}/bin/cp -r "$FLAKE_DIR/hosts/default" "$FLAKE_DIR/hosts/$target_hostname" + fi + + # Update variables.nix (hostName and gpuProfile) + host_vars_file="$FLAKE_DIR/hosts/$target_hostname/variables.nix" + if [ -f "$host_vars_file" ]; then + ${pkgs.gnused}/bin/sed -i "s/\(hostName[[:space:]]*=\)[[:space:]]*\"[^\"]*\"/\1 \"$target_hostname\"/" "$host_vars_file" + ${pkgs.gnused}/bin/sed -i "s/\(gpuProfile[[:space:]]*=\)[[:space:]]*\"[^\"]*\"/\1 \"$target_profile\"/" "$host_vars_file" else - echo "Error: Failed to update host in $FLAKE_NIX_PATH" >&2 + echo "Error: missing $host_vars_file" >&2 exit 1 fi - # Update profile - if ${pkgs.gnused}/bin/sed -i "s/^[[:space:]]*profile[[:space:]]*=[[:space:]]*\".*\"/ profile = \"$target_profile\"/" "$FLAKE_NIX_PATH"; then - echo "Successfully updated profile to: $target_profile" - else - echo "Error: Failed to update profile in $FLAKE_NIX_PATH" >&2 - exit 1 + # Ensure the host appears in the flake 'hosts' array + if ! ${pkgs.gnugrep}/bin/grep -q "\\\"$target_hostname\\\"" "$FLAKE_NIX_PATH"; then + echo "Adding '$target_hostname' to flake hosts list..." + ${pkgs.gnused}/bin/sed -i "/^\\s*hosts\\s*=\\s*\\[/a\\ \\\"$target_hostname\\\"" "$FLAKE_NIX_PATH" fi - echo "Flake.nix updated successfully!" + echo "Host '$target_hostname' is ready. You can now run: zcli rebuild" ;; add-host) hostname="" @@ -621,7 +639,12 @@ in echo "Enabling Doom Emacs in $host_vars_file..." ensure_doom_enabled echo "Rebuilding system so user modules are applied..." - if ${pkgs.nh}/bin/nh os switch --diff always --hostname "$PROFILE"; then + target="$(get_nh_target)" + if [ -z "$target" ]; then + echo "Error: Could not resolve flake config (no hosts/$(${pkgs.nettools}/bin/hostname) or hosts/default)." >&2 + exit 1 + fi + if ${pkgs.nh}/bin/nh os switch --diff always --hostname "$target"; then echo "Rebuild complete. Proceeding with Doom installation." else echo "Error: Rebuild failed. Please fix the build and re-run 'zcli doom install'." >&2 From 28efd07bbbdd8bd85d411f9225f2f4326bfd9344 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 15:20:33 -0500 Subject: [PATCH 025/232] removed zcli cleanup logging to zcli-cleanup-logs dir On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/scripts/zcli.nix --- modules/home/scripts/zcli.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 6ffb42c..9ad60ea 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -359,12 +359,6 @@ in fi fi - LOG_DIR="$HOME/zcli-cleanup-logs" - mkdir -p "$LOG_DIR" - LOG_FILE="$LOG_DIR/zcli-cleanup-$(${pkgs.coreutils}/bin/date +%Y-%m-%d_%H-%M-%S).log" - echo "Cleaning up old log files..." >> "$LOG_FILE" - ${pkgs.findutils}/bin/find "$LOG_DIR" -type f -mtime +3 -name "*.log" -delete >> "$LOG_FILE" 2>&1 - echo "Cleanup process logged to $LOG_FILE" ;; diag) echo "Generating system diagnostic report..." From 1ff5a24d477a5f73ae95887e3d0b105abe0ddd23 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 16:01:04 -0500 Subject: [PATCH 026/232] Updated CHANGELOG --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 903d1dd..2e90e9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,17 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** +#### 📅 **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: December 20th, 2025** - Refactored: From 9ed856ea451853d71ed71ba7297c8114beb28691 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 16:31:47 -0500 Subject: [PATCH 027/232] UPD: zcli add/del host update new feature list-hosts On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: CHANGELOG.md modified: modules/home/scripts/zcli.nix --- CHANGELOG.md | 2 + modules/home/scripts/zcli.nix | 85 +++++++++++++++++++++++++---------- 2 files changed, 63 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e90e9c..dc5c38b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ - 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** diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 9ad60ea..e9062d7 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -162,31 +162,36 @@ in echo "Usage: zcli [command] [options]" echo "" echo "Commands:" - echo " cleanup - Clean up old system generations. Can specify a number to keep." - echo " diag - Create a system diagnostic report." - echo " (Filename: homedir/diag.txt)" - echo " list-gens - List user and system generations." - echo " rebuild - Rebuild the NixOS system configuration." - echo " rebuild-boot - Rebuild and set as boot default (activates on next restart)." - echo " trim - Trim filesystems to improve SSD performance." - echo " update - Update the flake and rebuild the system." - echo " update-host - Auto set host and profile in flake.nix." - echo " (Opt: zcli update-host [hostname] [profile])" + echo " 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 " list-hosts - Show current hosts from flake.nix (prints the hosts array)." + 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 " 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 "" echo "Options for rebuild, rebuild-boot, and update commands:" - echo " --dry, -n - Show what would be done without doing it" - echo " --ask, -a - Ask for confirmation before proceeding" - echo " --cores N - Limit build to N cores (useful for VMs)" - echo " --verbose, -v - Show verbose output" - echo " --no-nom - Don't use nix-output-monitor" + echo " --dry, -n - Show what would be done without doing it" + echo " --ask, -a - Ask for confirmation before proceeding" + echo " --cores N - Limit build to N cores (useful for VMs)" + echo " --verbose, -v - Show verbose output" + echo " --no-nom - Don't use nix-output-monitor" echo "" echo "Doom Emacs:" - echo " doom install - Install Doom Emacs using get-doom script." - echo " doom status - Check if Doom Emacs is installed." - echo " doom remove - Remove Doom Emacs installation." - echo " doom update - Update Doom Emacs (runs doom sync)." + echo " doom install - Install Doom Emacs using get-doom script." + echo " doom status - Check if Doom Emacs is installed." + echo " doom remove - Remove Doom Emacs installation." + echo " doom update - Update Doom Emacs (runs doom sync)." echo "" - echo " help - Show this help message." + echo " help - Show this help message." } handle_backups() { @@ -329,6 +334,28 @@ in 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 --- if [ "$#" -eq 0 ]; then echo "Error: No command provided." >&2 @@ -375,6 +402,14 @@ in echo "--- System Generations ---" ${pkgs.nix}/bin/nix profile history --profile /nix/var/nix/profiles/system || echo "Could not list system generations." ;; + list-hosts) + if [ ! -f "$FLAKE_NIX_PATH" ]; then + echo "Error: flake.nix not found at $FLAKE_NIX_PATH" >&2 + exit 1 + fi + echo "Hosts defined in flake.nix:" + list_hosts_from_flake | ${pkgs.coreutils}/bin/sort | ${pkgs.coreutils}/bin/uniq + ;; rebuild) verify_hostname handle_backups @@ -496,10 +531,7 @@ in fi # Ensure the host appears in the flake 'hosts' array - if ! ${pkgs.gnugrep}/bin/grep -q "\\\"$target_hostname\\\"" "$FLAKE_NIX_PATH"; then - echo "Adding '$target_hostname' to flake hosts list..." - ${pkgs.gnused}/bin/sed -i "/^\\s*hosts\\s*=\\s*\\[/a\\ \\\"$target_hostname\\\"" "$FLAKE_NIX_PATH" - fi + ensure_host_in_flake_hosts "$target_hostname" echo "Host '$target_hostname' is ready. You can now run: zcli rebuild" ;; @@ -556,6 +588,9 @@ in echo "hardware.nix generated." fi + # Ensure the host appears in flake.nix hosts list + ensure_host_in_flake_hosts "$hostname" + echo "Adding new host to git..." ${pkgs.git}/bin/git -C "$HOME/$PROJECT" add . echo "hostname: $hostname added" @@ -578,6 +613,8 @@ in if [[ $REPLY =~ ^[Yy]$ ]]; then echo "Deleting host '$hostname'..." ${pkgs.coreutils}/bin/rm -rf "$HOME/$PROJECT/hosts/$hostname" + # Remove from flake.nix hosts list as well + remove_host_from_flake_hosts "$hostname" ${pkgs.git}/bin/git -C "$HOME/$PROJECT" add . echo "hostname: $hostname removed" else From c183db84a4016b816b6409bc5851d92285148724 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 16:45:25 -0500 Subject: [PATCH 028/232] Sorted/catagorized zcli help On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/scripts/zcli.nix --- modules/home/scripts/zcli.nix | 42 +++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index e9062d7..36be0f9 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -162,21 +162,31 @@ in echo "Usage: zcli [command] [options]" echo "" echo "Commands:" - echo " cleanup - Clean up old system generations. Can specify a number to keep." - echo " diag - Create a system diagnostic report." - echo " (Filename: homedir/diag.txt)" - echo " list-gens - List user and system generations." - echo " list-hosts - Show current hosts from flake.nix (prints the hosts array)." - 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 " add-host - Create host from template and add to flake.nix hosts list." + 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 " del-host - Remove host directory and prune from flake.nix hosts list." echo " (Usage: zcli del-host [hostname])" + echo " list-hosts - Show current hosts from flake.nix (prints the hosts array)." + echo " update-host - Auto set host and profile in flake.nix." + echo " (Opt: zcli update-host [hostname] [profile])" + echo "" + echo " Build and updates:" + echo " rebuild - Rebuild the NixOS system configuration." + echo " rebuild-boot - Rebuild and set as boot default (activates on next restart)." + echo " update - Update the flake and rebuild the system." + echo "" + echo " Maintenance:" + echo " cleanup - Clean up old system generations. Can specify a number to keep." + echo " diag - Create a system diagnostic report (saved to ~/diag.txt)." + echo " list-gens - List user and system generations." + echo " trim - Trim filesystems to improve SSD performance." + echo "" + echo " Doom Emacs:" + echo " doom install - Install Doom Emacs using get-doom script." + echo " doom status - Check if Doom Emacs is installed." + echo " doom remove - Remove Doom Emacs installation." + echo " doom update - Update Doom Emacs (runs doom sync)." echo "" echo "Options for rebuild, rebuild-boot, and update commands:" echo " --dry, -n - Show what would be done without doing it" @@ -185,12 +195,6 @@ in echo " --verbose, -v - Show verbose output" echo " --no-nom - Don't use nix-output-monitor" echo "" - echo "Doom Emacs:" - echo " doom install - Install Doom Emacs using get-doom script." - echo " doom status - Check if Doom Emacs is installed." - echo " doom remove - Remove Doom Emacs installation." - echo " doom update - Update Doom Emacs (runs doom sync)." - echo "" echo " help - Show this help message." } From e445d7bb664c3f0b56585ad1559675c874ff00bd Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 22 Dec 2025 18:09:19 -0500 Subject: [PATCH 029/232] disabled smartd when VM is selected Prevents rebuild switch failures On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: profiles/vm/default.nix --- profiles/vm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/profiles/vm/default.nix b/profiles/vm/default.nix index fbc2eb2..8df48de 100644 --- a/profiles/vm/default.nix +++ b/profiles/vm/default.nix @@ -10,5 +10,6 @@ drivers.nvidia-prime.enable = false; drivers.intel.enable = false; vm.guest-services.enable = true; + zaneyos.enableSmartD = lib.mkForce false; }; -} \ No newline at end of file +} From d10bb8dd1e1dbe5a35204089a0735a6ec2e74d9b Mon Sep 17 00:00:00 2001 From: Steven Scott Date: Mon, 22 Dec 2025 21:38:33 -0500 Subject: [PATCH 030/232] add nixpkgs-unstable overlay --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + modules/core/overlays.nix | 9 +++++++-- modules/core/packages.nix | 7 ++++++- modules/core/system.nix | 4 ++++ 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1392c2c..4fa75b3 100644 --- a/flake.lock +++ b/flake.lock @@ -450,6 +450,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f61125a668a320878494449750330ca58b78c557", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1764242076, @@ -620,6 +636,7 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "noctalia": "noctalia", "nvf": "nvf", diff --git a/flake.nix b/flake.nix index 946e66e..1f859f8 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nvf.url = "github:notashelf/nvf"; stylix.url = "github:danth/stylix/release-25.11"; nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest"; diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index 9d20b7c..1b18c86 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -3,7 +3,12 @@ # Provide pkgs.google-antigravity via antigravity-nix overlay inputs.antigravity-nix.overlays.default -# Local packages overlay (empty) - (final: prev: { }) + # pkgs.unstable overlay for bleeding edge applications + (_final: prev: { + unstable = import inputs.nixpkgs-unstable { + inherit (prev.stdenv.hostPlatform) system; + config.allowUnfree = true; + }; + }) ]; } diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 4043b5c..461f120 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -3,7 +3,7 @@ config, ... }: let - inherit (config.zaneyos) barChoice ; + inherit (config.zaneyos) barChoice; # Noctalia-specific packages noctaliaPkgs = if barChoice == "noctalia" @@ -13,6 +13,10 @@ app2unit # launcher for noctalia-shell ] else []; + + # bleeding edge packages from nixpkgs-unstable + unstablePkgs = with pkgs.unstable; [ + ]; in { programs = { neovim = { @@ -40,6 +44,7 @@ in { environment.systemPackages = with pkgs; noctaliaPkgs + ++ unstablePkgs ++ [ alejandra # nix formatter amfora # Fancy Terminal Browser For Gemini Protocol diff --git a/modules/core/system.nix b/modules/core/system.nix index a2a98c2..3cabb73 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -6,6 +6,10 @@ inherit (config.zaneyos) consoleKeyMap; in { nix = { + registry = { + # allow `nix run unstable#package` in terminal + unstable.flake = inputs.nixpkgs-unstable; + }; settings = { download-buffer-size = 200000000; auto-optimise-store = true; From ebbe6af5b19b9bb59e8d013ac4e519e451461051 Mon Sep 17 00:00:00 2001 From: Steven Scott Date: Tue, 23 Dec 2025 01:44:33 -0500 Subject: [PATCH 031/232] allow obs studio to be disabled --- modules/home/obs-studio.nix | 8 ++++++-- modules/options.nix | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/home/obs-studio.nix b/modules/home/obs-studio.nix index 05d8469..5aacdec 100644 --- a/modules/home/obs-studio.nix +++ b/modules/home/obs-studio.nix @@ -1,6 +1,10 @@ -{pkgs, ...}: { +{ + pkgs, + zaneyos, + ... +}: { programs.obs-studio = { - enable = true; + enable = zaneyos.obsStudioEnable; #enableVirtualCamera = true; plugins = with pkgs.obs-studio-plugins; [ wlrobs diff --git a/modules/options.nix b/modules/options.nix index 9c8b89a..1abfe14 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -78,7 +78,11 @@ with lib; { default = false; description = "Enable Doom Emacs."; }; - + obsStudioEnable = mkOption { + type = types.bool; + default = true; + description = "Enable OBS Studio."; + }; # Python development tools pythonEnable = mkOption { type = types.bool; From b3df6d414d5946262dd791539fea9cfd6f1f9f28 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 23 Dec 2025 17:18:10 -0500 Subject: [PATCH 032/232] Migrated fastfetches to zos On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/fastfetch/default.nix new file: modules/home/fastfetch/fastfetch-system-times.config.jsonc new file: modules/home/fastfetch/fastfetch1.config.jsonc new file: modules/home/fastfetch/fastfetch2.config.jsonc new file: modules/home/fastfetch/fastfetch3.config.jsonc new file: modules/home/fastfetch/fastfetch4.config.jsonc new file: modules/home/fastfetch/fastfetch5.config.jsonc modified: modules/home/scripts/default.nix new file: modules/home/scripts/ff.nix new file: modules/home/scripts/ff1.nix new file: modules/home/scripts/ff2.nix new file: modules/home/scripts/ff3.nix new file: modules/home/scripts/ff4.nix new file: modules/home/scripts/ff5.nix --- modules/home/fastfetch/default.nix | 11 ++ .../fastfetch-system-times.config.jsonc | 170 ++++++++++++++++++ .../home/fastfetch/fastfetch1.config.jsonc | 119 ++++++++++++ .../home/fastfetch/fastfetch2.config.jsonc | 128 +++++++++++++ .../home/fastfetch/fastfetch3.config.jsonc | 106 +++++++++++ .../home/fastfetch/fastfetch4.config.jsonc | 104 +++++++++++ .../home/fastfetch/fastfetch5.config.jsonc | 118 ++++++++++++ modules/home/scripts/default.nix | 7 + modules/home/scripts/ff.nix | 37 ++++ modules/home/scripts/ff1.nix | 37 ++++ modules/home/scripts/ff2.nix | 37 ++++ modules/home/scripts/ff3.nix | 37 ++++ modules/home/scripts/ff4.nix | 37 ++++ modules/home/scripts/ff5.nix | 37 ++++ 14 files changed, 985 insertions(+) create mode 100644 modules/home/fastfetch/fastfetch-system-times.config.jsonc create mode 100644 modules/home/fastfetch/fastfetch1.config.jsonc create mode 100644 modules/home/fastfetch/fastfetch2.config.jsonc create mode 100644 modules/home/fastfetch/fastfetch3.config.jsonc create mode 100644 modules/home/fastfetch/fastfetch4.config.jsonc create mode 100644 modules/home/fastfetch/fastfetch5.config.jsonc create mode 100644 modules/home/scripts/ff.nix create mode 100644 modules/home/scripts/ff1.nix create mode 100644 modules/home/scripts/ff2.nix create mode 100644 modules/home/scripts/ff3.nix create mode 100644 modules/home/scripts/ff4.nix create mode 100644 modules/home/scripts/ff5.nix diff --git a/modules/home/fastfetch/default.nix b/modules/home/fastfetch/default.nix index cdd1cd7..341c47e 100644 --- a/modules/home/fastfetch/default.nix +++ b/modules/home/fastfetch/default.nix @@ -133,4 +133,15 @@ ]; }; }; + + # Install additional Fastfetch JSON configs used by ff* wrappers + home.file = { + ".config/fastfetch/fastfetch-system-times.config.jsonc".source = ./fastfetch-system-times.config.jsonc; + ".config/fastfetch/fastfetch1.config.jsonc".source = ./fastfetch1.config.jsonc; + ".config/fastfetch/fastfetch2.config.jsonc".source = ./fastfetch2.config.jsonc; + ".config/fastfetch/fastfetch3.config.jsonc".source = ./fastfetch3.config.jsonc; + ".config/fastfetch/fastfetch4.config.jsonc".source = ./fastfetch4.config.jsonc; + ".config/fastfetch/fastfetch5.config.jsonc".source = ./fastfetch5.config.jsonc; + ".config/fastfetch/nixos.png".source = ./nixos.png; + }; } diff --git a/modules/home/fastfetch/fastfetch-system-times.config.jsonc b/modules/home/fastfetch/fastfetch-system-times.config.jsonc new file mode 100644 index 0000000..74c78e7 --- /dev/null +++ b/modules/home/fastfetch/fastfetch-system-times.config.jsonc @@ -0,0 +1,170 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "source": "~/.config/fastfetch/nixos.png", + "type": "kitty", + "height": 8, + "width": 16, + "padding": { + "top": 1, + "left": 4 + } + }, + "modules": [ + "break", + { + "type": "custom", + "format": "\u001b[32m┌─────────────────────────────────Hardware─────────────────────────────────┐", + "keyWidth": 20 + }, + { + "type": "board", + "key": " Motherboard:", + "format": "{1}", + "keyColor": "green", + "keyWidth": 20 + }, + { + "type": "bios", + "key": "│ ├ BIOS:", + "keyColor": "green", + "keyWidth": 20 + }, + { + "type": "battery", + "key": "│ └ Battery:", + "keyColor": "green", + "keyWidth": 20 + }, + { + "type": "cpu", + "key": "│ ├󰻠 CPU:", + "showPeCoreCount": true, + "keyColor": "green", + "keyWidth": 20 + }, + { + "type": "gpu", + "key": "│ ├󰢮 GPU:", + "keyColor": "green", + "format": "{2} {3}", + "keyWidth": 20 + }, + { + "type": "memory", + "key": "│ ├󰑭 RAM:", + "keyColor": "green", + "keyWidth": 20 + }, + { + "type": "disk", + "key": "│ └󰋊 Disk:", + "folders": "/", + "keyColor": "green", + "keyWidth": 20 + }, + { + "type": "custom", + "format": "\u001b[32m└──────────────────────────────────────────────────────────────────────────┘", + "keyWidth": 20 + }, + { + "type": "custom", + "format": "\u001b[33m┌─────────────────────────────────Software─────────────────────────────────┐", + "keyWidth": 20 + }, + { + "type": "os", + "key": " OS:", + "keyColor": "yellow", + "format": "{2}", + "keyWidth": 20 + }, + { + "type": "command", + "key": "│ ├ ZaneyOS:", + "keyColor": "yellow", + "text": "echo v${ZANEYOS_VERSION}", + "keyWidth": 20 + }, + { + "type": "initsystem", + "key": "│ ├ BootLoader:", + "format": "{1}", + "keyColor": "yellow", + "keyWidth": 20 + }, + { + "type": "kernel", + "key": "│ ├ Kernel:", + "keyColor": "yellow", + "keyWidth": 20 + }, + { + "type": "shell", + "key": "│ ├ Shell:", + "keyColor": "yellow", + "keyWidth": 20 + }, + { + "type": "packages", + "key": "│ ├󰏖 Packages:", + "keyColor": "yellow", + "keyWidth": 20 + }, + { + "type": "processes", + "key": "│ └ Processes:", + "keyColor": "yellow", + "keyWidth": 20 + }, + { + "type": "custom", + "format": "\u001b[33m└──────────────────────────────────────────────────────────────────────────┘", + "keyWidth": 20 + }, + { + "type": "custom", + "format": "\u001b[34m┌───────────────────────────Graphical Interface────────────────────────────┐", + "keyWidth": 20 + }, + { + "type": "wm", + "key": " WM:", + "keyColor": "blue", + "keyWidth": 20 + }, + { + "type": "theme", + "key": "│ ├󰉼 Theme:", + "format": "{2}", + "keyColor": "blue", + "keyWidth": 20 + }, + { + "type": "icons", + "key": "│ ├󰀻 Icons:", + "format": "{2}", + "keyColor": "blue", + "keyWidth": 20 + }, + { + "type": "terminal", + "key": "│ ├ Terminal:", + "keyColor": "blue", + "keyWidth": 20 + }, + { + "type": "font", + "key": "│ └ UI Font:", + "format": "{2}", + "keyColor": "blue", + "keyWidth": 20 + }, + { + "type": "custom", + "format": "\u001b[34m└──────────────────────────────────────────────────────────────────────────┘", + "keyWidth": 20 + } + ] +} diff --git a/modules/home/fastfetch/fastfetch1.config.jsonc b/modules/home/fastfetch/fastfetch1.config.jsonc new file mode 100644 index 0000000..5c3ad22 --- /dev/null +++ b/modules/home/fastfetch/fastfetch1.config.jsonc @@ -0,0 +1,119 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "type": "kitty-direct", + "source": "~/.config/fastfetch/nixos.png", + "height": 10, + "width": 21, + "padding": { + "top": 2, + "left": 2 + } + }, + "display": { + "separator": " " + }, + "modules": [ + "break", + { + "type": "title", + "keyWidth": 10 + }, + { + "type": "os", + "key": " OS", + "keyColor": "yellow" + }, + { + "type": "command", + "key": "├ ZaneyOS", + "keyColor": "yellow", + "text": "echo v${ZANEYOS_VERSION}" + }, + { + "type": "kernel", + "key": "├ Kernel", + "keyColor": "yellow" + }, + { + "type": "packages", + "key": "├󰏖 Packages", + "keyColor": "yellow" + }, + { + "type": "shell", + "key": "├ Shell", + "keyColor": "yellow" + }, + { + "type": "command", + "key": "└ Age", + "keyColor": "yellow", + "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days" + }, + "break", + { + "type": "de", + "key": " DE", + "keyColor": "blue" + }, + { + "type": "wm", + "key": "󰧨 Window Manager", + "keyColor": "blue" + }, + { + "type": "lm", + "key": "├󰧨 Login Manager", + "keyColor": "blue" + }, + { + "type": "wmtheme", + "key": "├󰉼 WM Theme", + "keyColor": "blue" + }, + { + "type": "theme", + "format": "{1}", + "key": "├󰉼 Color Themes", + "keyColor": "blue" + }, + { + "type": "terminal", + "key": "└ Terminal", + "keyColor": "blue" + }, + "break", + { + "type": "chassis", + "key": "󰌢 PC", + "keyColor": "green" + }, + { + "type": "cpu", + "key": "├󰻠 CPU", + "keyColor": "green" + }, + { + "type": "gpu", + "key": "├󰍛 GPU", + "keyColor": "green" + }, + { + "type": "opengl", + "key": "├󰍛 OpenGL", + "keyColor": "green" + }, + { + "type": "vulkan", + "key": "├󰍛 Vulkan", + "keyColor": "green" + }, + { + "type": "display", + "key": "└󰍹 Display(s)", + "keyColor": "green" + }, + "break" + ] +} diff --git a/modules/home/fastfetch/fastfetch2.config.jsonc b/modules/home/fastfetch/fastfetch2.config.jsonc new file mode 100644 index 0000000..e753c51 --- /dev/null +++ b/modules/home/fastfetch/fastfetch2.config.jsonc @@ -0,0 +1,128 @@ +{ + "display": { + "color": { + "keys": "35", + "output": "95" + }, + "separator": " ➜ " + }, + "logo": { + "height": 14, + "width": 34, + "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" + } + ] +} diff --git a/modules/home/fastfetch/fastfetch3.config.jsonc b/modules/home/fastfetch/fastfetch3.config.jsonc new file mode 100644 index 0000000..cee82ef --- /dev/null +++ b/modules/home/fastfetch/fastfetch3.config.jsonc @@ -0,0 +1,106 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "display": { + "separator": " | ", + "color": { + "output": "white" + } + }, + "logo": { + "height": 6, + "width": 12, + "padding": { + "left": 0, + "top": 1, + "right": 4 + }, + "source": "~/.config/fastfetch/nixos.png", + "type": "kitty", + "color": { + "1": "#FE8019", + "2": "white" + } + }, + "modules": [ + { + "type": "title", + "key": " 󰌾", + "keyColor": "#FE8019", + "color": { + "user": "white", + "at": "#FE8019", + "host": "white" + } + }, + "break", + { + "type": "os", + "key": " 󰌽", + "keyColor": "#FABD2F", + "format": "{pretty-name}" + }, + { + "type": "kernel", + "key": " 󰒓", + "keyColor": "#FABD2F", + "format": "{1} {2}" + }, + { + "type": "uptime", + "key": " 󰅐", + "keyColor": "#FABD2F" + }, + { + "type": "host", + "key": " 󰾰", + "keyColor": "#83A598" + }, + { + "type": "cpu", + "key": " 󰻠", + "keyColor": "#83A598" + }, + { + "type": "gpu", + "key": " 󰍛", + "keyColor": "#83A598" + }, + { + "type": "memory", + "key": " 󰇕", + "keyColor": "#83A598" + }, + { + "type": "display", + "key": " 󰍹", + "keyColor": "#83A598" + }, + "break", + { + "type": "wm", + "key": " 󰖲", + "keyColor": "#B8BB26" + }, + { + "type": "shell", + "key": " 󰞷", + "keyColor": "#B8BB26" + }, + { + "type": "terminal", + "key": " 󰹑", + "keyColor": "#B8BB26" + }, + { + "type": "packages", + "key": " 󰏖", + "keyColor": "#B8BB26" + }, + "break", + { + "type": "colors", + "paddingLeft": 2, + "symbol": "circle" + } + ] +} diff --git a/modules/home/fastfetch/fastfetch4.config.jsonc b/modules/home/fastfetch/fastfetch4.config.jsonc new file mode 100644 index 0000000..8217665 --- /dev/null +++ b/modules/home/fastfetch/fastfetch4.config.jsonc @@ -0,0 +1,104 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "type": "kitty", + "source": "~/.config/fastfetch/nixos.png", + "height": 8, + "width": 16, + "padding": { + "top": 2, + "left": 2 + } + }, + "display": { + "separator": " " + }, + "modules": [ + "break", + { + "type": "os", + "key": "󱄅 OS", + "keyColor": "blue" + }, + { + "type": "command", + "key": "├ ZaneyOS", + "keyColor": "blue", + "text": "echo v${ZANEYOS_VERSION}" + }, + { + "type": "kernel", + "key": "├ Kernel", + "keyColor": "blue" + }, + { + "type": "packages", + "key": "├󰏖 Packages", + "keyColor": "blue" + }, + { + "type": "shell", + "key": "└ Shell", + "keyColor": "blue" + }, + "break", + { + "type": "wm", + "key": "󰝘 WM", + "keyColor": "cyan" + }, + { + "type": "wmtheme", + "key": "├󰉼 WM Theme", + "keyColor": "cyan" + }, + { + "type": "theme", + "format": "{1}", + "key": "├󰉼 Color Theme", + "keyColor": "cyan" + }, + { + "type": "terminal", + "key": "├ Terminal", + "keyColor": "cyan" + }, + { + "type": "terminalfont", + "key": "└󰌯 Font", + "keyColor": "cyan" + }, + "break", + { + "type": "chassis", + "key": "󰌢 PC", + "keyColor": "green" + }, + { + "type": "cpu", + "key": "├󰻠 CPU", + "keyColor": "green" + }, + { + "type": "gpu", + "key": "├󰍛 GPU", + "keyColor": "green" + }, + { + "type": "memory", + "key": "├󰍹 Memory", + "keyColor": "green" + }, + { + "type": "disk", + "key": "└󰋊 Storage", + "keyColor": "green" + }, + "break", + { + "type": "uptime", + "key": "󰥠 Uptime", + "keyColor": "magenta" + } + ] +} diff --git a/modules/home/fastfetch/fastfetch5.config.jsonc b/modules/home/fastfetch/fastfetch5.config.jsonc new file mode 100644 index 0000000..374bd51 --- /dev/null +++ b/modules/home/fastfetch/fastfetch5.config.jsonc @@ -0,0 +1,118 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "type": "kitty", + "source": "~/.config/fastfetch/nixos.png", + "height": 8, + "width": 16, + "padding": { + "top": 2, + "left": 2 + } + }, + "display": { + "separator": "", + "constants": [ + "\u001b[89G│\u001b[55G " + ] + }, + "modules": [ + { + "type": "custom", + "key": "╭─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╮" + }, + { + "type": "board", + "key": "├  ", + "format": "{name}" + }, + { + "type": "cpu", + "key": "├  ", + "format": "{name}" + }, + { + "type": "gpu", + "key": "├ 󰍛 ", + "format": "{name}" + }, + { + "type": "memory", + "key": "├ 󰇕 ", + "format": "{used}/{total} ({percentage})" + }, + { + "type": "disk", + "key": "├ 󰋊 ", + "format": "{size-used}/{size-total} ({size-percentage})" + }, + { + "type": "custom", + "key": "╰─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╯" + }, + "break", + { + "type": "custom", + "key": "╭─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╮" + }, + { + "type": "os", + "key": "├ 󱄅 ", + "format": "{name} {version}" + }, + { + "type": "kernel", + "key": "├  ", + "format": "{sysname} {release}" + }, + { + "type": "uptime", + "key": "├  ", + "format": "{formatted}" + }, + { + "type": "custom", + "key": "╰─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╯" + }, + "break", + { + "type": "custom", + "key": "╭─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╮" + }, + { + "type": "wm", + "key": "├ 󰝘 ", + "format": "{pretty-name} {version}" + }, + { + "type": "terminal", + "key": "├  ", + "format": "{pretty-name} {version}" + }, + { + "type": "shell", + "key": "├  ", + "format": "{pretty-name} {version}" + }, + { + "type": "terminalfont", + "key": "├  ", + "format": "{name}" + }, + { + "type": "cursor", + "key": "├ 󰇀 ", + "format": "{theme}" + }, + { + "type": "custom", + "key": "╰─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╯" + }, + "break", + { + "type": "colors", + "symbol": "circle", + "paddingLeft": 12 + } + ] +} diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index c9e7c33..8bbda94 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -17,6 +17,13 @@ (import ./screenshootin.nix {inherit pkgs;}) (import ./squirtle.nix {inherit pkgs;}) (import ./task-waybar.nix {inherit pkgs;}) + # Fastfetch wrappers + (import ./ff.nix {inherit pkgs;}) + (import ./ff1.nix {inherit pkgs;}) + (import ./ff2.nix {inherit pkgs;}) + (import ./ff3.nix {inherit pkgs;}) + (import ./ff4.nix {inherit pkgs;}) + (import ./ff5.nix {inherit pkgs;}) (import ./wallsetter.nix { inherit pkgs; inherit username; diff --git a/modules/home/scripts/ff.nix b/modules/home/scripts/ff.nix new file mode 100644 index 0000000..6696cf4 --- /dev/null +++ b/modules/home/scripts/ff.nix @@ -0,0 +1,37 @@ +{pkgs}: +pkgs.writeTextFile { + name = "ff"; + executable = true; + destination = "/bin/ff"; + text = '' + #!${pkgs.bash}/bin/bash + set -euo pipefail + + cfg="$HOME/.config/fastfetch/fastfetch-system-times.config.jsonc" + + parent_pid=$PPID + parent_name="" + if [[ -r "/proc/$parent_pid/comm" ]]; then + parent_name="$(tr -d '\0' < "/proc/$parent_pid/comm")" + else + parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)" + fi + if [[ -z "$parent_name" && -n "${SHELL:-}" ]]; then + parent_name="$(basename -- "$SHELL")" + fi + + case "$parent_name" in + *zsh*) shell="${pkgs.zsh}/bin/zsh" ;; + *bash*) shell="${pkgs.bash}/bin/bash" ;; + *fish*) shell="${pkgs.fish}/bin/fish" ;; + *nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;; + *) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;; + esac + + if [[ -z "${shell:-}" ]]; then + shell="${pkgs.zsh}/bin/zsh" + fi + + exec "$shell" -c "fastfetch -c \"$cfg\"" + ''; +} diff --git a/modules/home/scripts/ff1.nix b/modules/home/scripts/ff1.nix new file mode 100644 index 0000000..5381efe --- /dev/null +++ b/modules/home/scripts/ff1.nix @@ -0,0 +1,37 @@ +{pkgs}: +pkgs.writeTextFile { + name = "ff1"; + executable = true; + destination = "/bin/ff1"; + text = '' + #!${pkgs.bash}/bin/bash + set -euo pipefail + + cfg="$HOME/.config/fastfetch/fastfetch1.config.jsonc" + + parent_pid=$PPID + parent_name="" + if [[ -r "/proc/$parent_pid/comm" ]]; then + parent_name="$(tr -d '\0' < "/proc/$parent_pid/comm")" + else + parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)" + fi + if [[ -z "$parent_name" && -n "${SHELL:-}" ]]; then + parent_name="$(basename -- "$SHELL")" + fi + + case "$parent_name" in + *zsh*) shell="${pkgs.zsh}/bin/zsh" ;; + *bash*) shell="${pkgs.bash}/bin/bash" ;; + *fish*) shell="${pkgs.fish}/bin/fish" ;; + *nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;; + *) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;; + esac + + if [[ -z "${shell:-}" ]]; then + shell="${pkgs.zsh}/bin/zsh" + fi + + exec "$shell" -c "fastfetch -c \"$cfg\"" + ''; +} diff --git a/modules/home/scripts/ff2.nix b/modules/home/scripts/ff2.nix new file mode 100644 index 0000000..5e0fdb9 --- /dev/null +++ b/modules/home/scripts/ff2.nix @@ -0,0 +1,37 @@ +{pkgs}: +pkgs.writeTextFile { + name = "ff2"; + executable = true; + destination = "/bin/ff2"; + text = '' + #!${pkgs.bash}/bin/bash + set -euo pipefail + + cfg="$HOME/.config/fastfetch/fastfetch2.config.jsonc" + + parent_pid=$PPID + parent_name="" + if [[ -r "/proc/$parent_pid/comm" ]]; then + parent_name="$(tr -d '\0' < "/proc/$parent_pid/comm")" + else + parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)" + fi + if [[ -z "$parent_name" && -n "${SHELL:-}" ]]; then + parent_name="$(basename -- "$SHELL")" + fi + + case "$parent_name" in + *zsh*) shell="${pkgs.zsh}/bin/zsh" ;; + *bash*) shell="${pkgs.bash}/bin/bash" ;; + *fish*) shell="${pkgs.fish}/bin/fish" ;; + *nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;; + *) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;; + esac + + if [[ -z "${shell:-}" ]]; then + shell="${pkgs.zsh}/bin/zsh" + fi + + exec "$shell" -c "fastfetch -c \"$cfg\"" + ''; +} diff --git a/modules/home/scripts/ff3.nix b/modules/home/scripts/ff3.nix new file mode 100644 index 0000000..14c79c5 --- /dev/null +++ b/modules/home/scripts/ff3.nix @@ -0,0 +1,37 @@ +{pkgs}: +pkgs.writeTextFile { + name = "ff3"; + executable = true; + destination = "/bin/ff3"; + text = '' + #!${pkgs.bash}/bin/bash + set -euo pipefail + + cfg="$HOME/.config/fastfetch/fastfetch3.config.jsonc" + + parent_pid=$PPID + parent_name="" + if [[ -r "/proc/$parent_pid/comm" ]]; then + parent_name="$(tr -d '\0' < "/proc/$parent_pid/comm")" + else + parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)" + fi + if [[ -z "$parent_name" && -n "''${SHELL:-}" ]]; then + parent_name="$(basename -- "$SHELL")" + fi + + case "$parent_name" in + *zsh*) shell="${pkgs.zsh}/bin/zsh" ;; + *bash*) shell="${pkgs.bash}/bin/bash" ;; + *fish*) shell="${pkgs.fish}/bin/fish" ;; + *nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;; + *) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;; + esac + + if [[ -z "''${shell:-}" ]]; then + shell="${pkgs.zsh}/bin/zsh" + fi + + exec "$shell" -c "fastfetch -c \"$cfg\"" + ''; +} diff --git a/modules/home/scripts/ff4.nix b/modules/home/scripts/ff4.nix new file mode 100644 index 0000000..921430b --- /dev/null +++ b/modules/home/scripts/ff4.nix @@ -0,0 +1,37 @@ +{pkgs}: +pkgs.writeTextFile { + name = "ff4"; + executable = true; + destination = "/bin/ff4"; + text = '' + #!${pkgs.bash}/bin/bash + set -euo pipefail + + cfg="$HOME/.config/fastfetch/fastfetch4.config.jsonc" + + parent_pid=$PPID + parent_name="" + if [[ -r "/proc/$parent_pid/comm" ]]; then + parent_name="$(tr -d '\0' < "/proc/$parent_pid/comm")" + else + parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)" + fi + if [[ -z "$parent_name" && -n "''${SHELL:-}" ]]; then + parent_name="$(basename -- "$SHELL")" + fi + + case "$parent_name" in + *zsh*) shell="${pkgs.zsh}/bin/zsh" ;; + *bash*) shell="${pkgs.bash}/bin/bash" ;; + *fish*) shell="${pkgs.fish}/bin/fish" ;; + *nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;; + *) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;; + esac + + if [[ -z "''${shell:-}" ]]; then + shell="${pkgs.zsh}/bin/zsh" + fi + + exec "$shell" -c "fastfetch -c \"$cfg\"" + ''; +} diff --git a/modules/home/scripts/ff5.nix b/modules/home/scripts/ff5.nix new file mode 100644 index 0000000..b6f61c1 --- /dev/null +++ b/modules/home/scripts/ff5.nix @@ -0,0 +1,37 @@ +{pkgs}: +pkgs.writeTextFile { + name = "ff5"; + executable = true; + destination = "/bin/ff5"; + text = '' + #!${pkgs.bash}/bin/bash + set -euo pipefail + + cfg="$HOME/.config/fastfetch/fastfetch5.config.jsonc" + + parent_pid=$PPID + parent_name="" + if [[ -r "/proc/$parent_pid/comm" ]]; then + parent_name="$(tr -d '\\0' < "/proc/$parent_pid/comm")" + else + parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)" + fi + if [[ -z "$parent_name" && -n "''${SHELL:-}" ]]; then + parent_name="$(basename -- "$SHELL")" + fi + + case "$parent_name" in + *zsh*) shell="${pkgs.zsh}/bin/zsh" ;; + *bash*) shell="${pkgs.bash}/bin/bash" ;; + *fish*) shell="${pkgs.fish}/bin/fish" ;; + *nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;; + *) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;; + esac + + if [[ -z "''${shell:-}" ]]; then + shell="${pkgs.zsh}/bin/zsh" + fi + + exec "$shell" -c "fastfetch -c \"$cfg\"" + ''; +} From 88c2272b610e93a8b46c1991bfb91c6f9cd1b63b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 23 Dec 2025 17:30:14 -0500 Subject: [PATCH 033/232] Removed old upgrade docs, fixed ff2 sizing On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/fastfetch/fastfetch2.config.jsonc deleted: modules/src/UPGRADE-2.3-to-2.4.es.md deleted: modules/src/UPGRADE-2.3-to-2.4.md deleted: modules/src/ZaneyOS-Upgrade.es.md deleted: modules/src/ZaneyOS-Upgrade.md deleted: modules/src/compare-zaneyos-config.sh deleted: modules/src/revert-to-2.3.sh deleted: modules/src/upgrade-2.3-to-2.4.sh --- .../home/fastfetch/fastfetch2.config.jsonc | 4 +- modules/src/UPGRADE-2.3-to-2.4.es.md | 221 ---- modules/src/UPGRADE-2.3-to-2.4.md | 225 ---- modules/src/ZaneyOS-Upgrade.es.md | 147 --- modules/src/ZaneyOS-Upgrade.md | 189 --- modules/src/compare-zaneyos-config.sh | 465 -------- modules/src/revert-to-2.3.sh | 45 - modules/src/upgrade-2.3-to-2.4.sh | 1020 ----------------- 8 files changed, 2 insertions(+), 2314 deletions(-) delete mode 100644 modules/src/UPGRADE-2.3-to-2.4.es.md delete mode 100644 modules/src/UPGRADE-2.3-to-2.4.md delete mode 100644 modules/src/ZaneyOS-Upgrade.es.md delete mode 100644 modules/src/ZaneyOS-Upgrade.md delete mode 100755 modules/src/compare-zaneyos-config.sh delete mode 100755 modules/src/revert-to-2.3.sh delete mode 100755 modules/src/upgrade-2.3-to-2.4.sh diff --git a/modules/home/fastfetch/fastfetch2.config.jsonc b/modules/home/fastfetch/fastfetch2.config.jsonc index e753c51..ae5cbca 100644 --- a/modules/home/fastfetch/fastfetch2.config.jsonc +++ b/modules/home/fastfetch/fastfetch2.config.jsonc @@ -7,8 +7,8 @@ "separator": " ➜ " }, "logo": { - "height": 14, - "width": 34, + "height": 7, + "width": 14, "padding": { "left": 2, "top": 2 diff --git a/modules/src/UPGRADE-2.3-to-2.4.es.md b/modules/src/UPGRADE-2.3-to-2.4.es.md deleted file mode 100644 index 19a0908..0000000 --- a/modules/src/UPGRADE-2.3-to-2.4.es.md +++ /dev/null @@ -1,221 +0,0 @@ -[English](UPGRADE-2.3-to-2.4.md) | [Español](UPGRADE-2.3-to-2.4.es.md) - -# Guía de Actualización ZaneyOS 2.3 → 2.4 - -Esta guía proporciona scripts de actualización seguros para migrar de ZaneyOS 2.3 a 2.4, manejando cambios incompatibles y preservando tu configuración personalizada. - -## 🔄 Cambios Importantes en 2.4 - -- **SDDM** ahora es el display manager predeterminado (antes tui-greetd) -- **Selección de terminal**: terminales habilitables por bandera -- **Nuevas variables**: añadidas en `variables.nix` -- **Breaking changes**: actualizaciones directas fallan por variables faltantes - -## 📋 Qué hace el Script de Actualización - -1. **Análisis previo** con reporte detallado -2. **Respaldo completo** de tu sistema actual -3. **Verificación de versión** (debes estar en 2.3) -4. **Actualización segura**: cambia a main (2.4) y migra -5. **Migración de variables** al nuevo formato -6. **Manejo de terminales**: habilita tu preferida en 2.4 -7. **Build seguro** con `boot` para evitar problemas con SDDM -8. **Opción de revert** fácil si algo sale mal - -## 🛡️ Características de Seguridad - -- **Respaldo completo** de ~/zaneyos antes de cambios -- **Boot vs Switch**: usa build de arranque seguro -- **Revert** sencillo para restaurar 2.3 -- **Validaciones** previas al proceso -- **Logging** exhaustivo para troubleshooting - -## 🚀 Cómo Actualizar - -### Paso 0: Obtén el script de forma segura (NO hagas git pull) - -Para evitar sobrescribir tu configuración local antes de crear un respaldo, descarga solo el script sin modificar tu working tree. - -Opción A — Usando tu remoto git (recomendado): -```bash -# Trae refs sin tocar tu working tree -git -C ~/zaneyos fetch origin - -# Escribe el script desde origin/main a tu home -git -C ~/zaneyos show origin/main:upgrade-2.3-to-2.4.sh > ~/upgrade-2.3-to-2.4.sh -chmod +x ~/upgrade-2.3-to-2.4.sh -``` - -Opción B — Usando curl: -```bash -curl -fsSL https://gitlab.com/zaney/zaneyos/-/raw/main/upgrade-2.3-to-2.4.sh -o ~/upgrade-2.3-to-2.4.sh -chmod +x ~/upgrade-2.3-to-2.4.sh -``` - -Ambos métodos mantienen tu repo local intacto. El script creará un respaldo completo antes de cambiar ramas. - -### Paso 1: Ejecuta el Script - -```bash -# Puedes ejecutarlo desde cualquier ruta; opera sobre ~/zaneyos -~/upgrade-2.3-to-2.4.sh -``` - -### Paso 2: Revisa el Análisis Previo - -El script realizará un análisis completo de tu configuración actual: -- **Analiza flake.nix** (inputs y perfil actual) -- **Escanea hosts** y detecta personalizaciones -- **Revisa paquetes globales** en modules/core/packages.nix -- **Detecta personalizaciones de shell** (zsh, bash, eza) -- **Identifica módulos personalizados** y archivos personales -- **Genera un informe detallado** en `~/zaneyos-upgrade-analysis-TIMESTAMP.txt` - -**Verás claramente:** -- ✅ **Qué se migrará automáticamente** (variables, paquetes, configs) -- ⚠️ **Qué requiere atención manual** (inputs personalizados, archivos personales) -- 📋 **Resumen** de hosts y personalizaciones detectadas - -### Paso 3: Sigue los Prompts - -Luego de revisar el análisis, el script: -- Creará un respaldo (verás la ruta) -- Pedirá confirmación antes de continuar -- Descargarà 2.4 desde main -- Migrará automáticamente tu configuración -- Compilará el nuevo sistema -- Pedirá reinicio - -### Paso 4: Reinicia el Sistema - -Tras un build exitoso: -```bash -sudo reboot -``` - -Tu sistema iniciará con: -- SDDM como gestor de acceso -- Todos tus ajustes preservados -- Funcionalidades de 2.4 disponibles - -## 🔧 Detalles de Migración - -### Ajustes preservados automáticamente: -- Usuario y email de Git -- Preferencia de navegador -- Elección de terminal (con habilitación automática) -- Layout de teclado y console keymap -- NFS, impresión y Thunar -- Formato de reloj (12h/24h) -- Ajustes de monitores -- Fondo (stylixImage) -- Tema de Waybar -- Animaciones -- Hardware -- **Paquetes globales** (modules/core/packages.nix) -- **Paquetes por host** (hosts/[hostname]/host-packages.nix) -- **Imports personalizados** (hosts/[hostname]/default.nix si aplica) - -### Manejo de Terminales: -Si usabas una terminal específica en 2.3: -- **Kitty**: ya habilitada por defecto en 2.4 -- **Alacritty**: se habilita `alacrittyEnable = true` -- **WezTerm**: se habilita `weztermEnable = true` -- **Ghostty**: se habilita `ghosttyEnable = true` - -## ⚠️ Notas Importantes - -### Display Manager SDDM -- 2.4 usa SDDM por defecto -- La actualización usa `boot` para evitar problemas visuales -- **Debes reiniciar** tras la actualización; no uses `switch` - -### Ubicación del Respaldo -``` -~/.config/zaneyos-backups/zaneyos-2.3-upgrade-backup-TIMESTAMP/ -``` - -## 🔄 Cómo Revertir - -Si algo falla, puedes revertir fácilmente: - -### Opción 1: Script de revert -```bash -cd ~/zaneyos -./revert-to-2.3.sh -``` - -### Opción 2: Script principal -```bash -cd ~/zaneyos -./upgrade-2.3-to-2.4.sh --revert -``` - -### Opción 3: Reversión manual -1. Elimina `~/zaneyos`: `rm -rf ~/zaneyos` -2. Restaura desde el respaldo: `cp -r ~/.config/zaneyos-backups/[backup-name]/zaneyos ~/` -3. Rebuild: `nh os boot ~/zaneyos --hostname [profile]` -4. Reinicia - -## 🔍 Troubleshooting - -### Fallos de build -- Revisa el log (ruta mostrada por el script) -- Asegura espacio en disco suficiente -- Prueba revert y reporta - -### Problemas de visualización tras reinicio -- Si ves pantalla en negro, espera unos segundos a que SDDM arranque -- Cambia a TTY (Ctrl+Alt+F2) si lo necesitas -- Inicia sesión y ejecuta `systemctl status display-manager` - -### Aplicaciones faltantes -- Verifica tu terminal preferida en `~/zaneyos/hosts/[hostname]/variables.nix` -- Confirma que navegador y otras apps sigan disponibles - -### Log de ejecución -Cada corrida genera un log en: `~/zaneyos-upgrade-TIMESTAMP.log` - -## 📁 Estructura tras la actualización - -``` -~/zaneyos/hosts/[tu-hostname]/ -├── hardware.nix (preservado de 2.3) -└── variables.nix (actualizado a 2.4 con tus ajustes) -``` - -## 🆘 Recuperación de Emergencia - -Si algo sale mal: -1. Tu respaldo 2.3 está intacto -2. Arranca con un USB live de NixOS -3. Monta el sistema y restaura el respaldo -4. Tus datos y configuración están seguros - -## ✅ Lista de Verificación Post‑Actualización - -Tras actualizar y reiniciar: -- [ ] Aparece la pantalla de login de SDDM -- [ ] El escritorio carga correctamente -- [ ] Se abre tu terminal preferida -- [ ] El navegador funciona -- [ ] Se preservó fondo/tema -- [ ] Configuración de monitores correcta -- [ ] Aplicaciones necesarias disponibles - -## 🤝 Ayuda - -Si encuentras problemas: -1. Revisa el log de ejecución -2. Prueba la reversión a 2.3 -3. Reporta con contenido del log -4. Tu respaldo permite recuperación manual - ---- - -## Archivos de Script -- `upgrade-2.3-to-2.4.sh` — Script principal -- `revert-to-2.3.sh` — Wrapper de reversión -- `UPGRADE-2.3-to-2.4.md` — Esta documentación - -Recuerda: se crea un respaldo completo antes de cualquier cambio, por lo que siempre puedes recuperarte. diff --git a/modules/src/UPGRADE-2.3-to-2.4.md b/modules/src/UPGRADE-2.3-to-2.4.md deleted file mode 100644 index 5ccded0..0000000 --- a/modules/src/UPGRADE-2.3-to-2.4.md +++ /dev/null @@ -1,225 +0,0 @@ -[English](UPGRADE-2.3-to-2.4.md) | [Español](UPGRADE-2.3-to-2.4.es.md) - -# ZaneyOS 2.3 → 2.4 Upgrade Guide - -This guide provides safe upgrade scripts to migrate from ZaneyOS 2.3 to 2.4, handling all the breaking changes and ensuring your custom configuration is preserved. - -## 🔄 Major Changes in 2.4 - -- **SDDM** is now the default display manager (was previously tui-greetd) -- **Terminal Selection**: Individual terminal applications can be enabled/disabled -- **New Variables**: Additional configuration variables added to `variables.nix` -- **Breaking Changes**: Direct upgrade causes build failures due to missing variables - -## 📋 What the Upgrade Script Does - -1. **Pre-Upgrade Analysis**: Comprehensive analysis of your current configuration with detailed report -2. **Full Backup**: Creates complete backup of your current system -3. **Version Verification**: Confirms you're running ZaneyOS 2.3 -4. **Safe Upgrade**: Switches to main branch (2.4) and merges configurations -5. **Variable Merging**: Automatically migrates all your settings to new format -6. **Terminal Handling**: Ensures your preferred terminal is enabled in 2.4 -7. **Safe Build**: Uses `boot` option to avoid SDDM display issues -8. **Revert Option**: Provides easy rollback if anything goes wrong - -## 🛡️ Safety Features - -- **Complete Backup**: Full copy of your zaneyos directory before any changes -- **Boot vs Switch**: Uses safe boot option to prevent display manager conflicts -- **Revert Function**: Can completely restore 2.3 backup with one command -- **Validation**: Checks system state before proceeding -- **Logging**: Comprehensive log file for troubleshooting - -## 🚀 How to Upgrade - -### Step 0: Get the upgrade script safely (do NOT git pull yet) - -To avoid overwriting your local configuration before a backup is created, fetch just the upgrade script without modifying your working tree. - -Option A — Using your existing git remote (recommended): -```bash -# Fetch the latest refs without touching your working tree -git -C ~/zaneyos fetch origin - -# Write the script from origin/main into your home directory -git -C ~/zaneyos show origin/main:upgrade-2.3-to-2.4.sh > ~/upgrade-2.3-to-2.4.sh -chmod +x ~/upgrade-2.3-to-2.4.sh -``` - -Option B — Using curl (if you don't have a usable origin remote): -```bash -curl -fsSL https://gitlab.com/zaney/zaneyos/-/raw/main/upgrade-2.3-to-2.4.sh -o ~/upgrade-2.3-to-2.4.sh -chmod +x ~/upgrade-2.3-to-2.4.sh -``` - -Both methods keep your local repo unchanged. The script will create a full backup before switching branches. - -### Step 1: Run the Upgrade Script - -```bash -# You can run the script from anywhere; it operates on ~/zaneyos -~/upgrade-2.3-to-2.4.sh -``` - -### Step 2: Review the Pre-Upgrade Analysis - -The script will first perform a comprehensive analysis of your current configuration: -- **Analyze flake.nix** for custom inputs and current profile -- **Scan all host configurations** and detect customizations -- **Check global packages** in modules/core/packages.nix -- **Detect shell customizations** (zsh, bash, eza personal files) -- **Identify other custom modules** and personal files -- **Generate a detailed report** saved as `~/zaneyos-upgrade-analysis-TIMESTAMP.txt` - -**The analysis will clearly show:** -- ✅ **What WILL be automatically migrated** (variables, packages, configs) -- ⚠️ **What requires manual attention** (custom inputs, personal shell files) -- 📋 **Summary of all hosts and customizations** found - -### Step 3: Follow the Prompts - -After reviewing the analysis, the script will: -- Create a backup (you'll see the location) -- Ask for confirmation before proceeding -- Download ZaneyOS 2.4 from main branch -- Merge your configuration automatically -- Build the new system -- Prompt for reboot - -### Step 4: Reboot Your System - -After successful build: -```bash -sudo reboot -``` - -Your system will now boot with: -- SDDM as the login manager -- All your previous settings preserved -- New 2.4 features available - -## 🔧 Configuration Migration Details - -### Automatically Preserved Settings: -- Git username and email -- Browser preference -- Terminal choice (with automatic enabling) -- Keyboard layout and console keymap -- NFS, printing, and Thunar settings -- Clock format (12h/24h) -- Monitor settings -- Wallpaper (stylixImage) -- Waybar theme choice -- Animation settings -- Hardware configuration -- **Global packages** (modules/core/packages.nix customizations) -- **Host-specific packages** (hosts/[hostname]/host-packages.nix) -- **Custom module imports** (hosts/[hostname]/default.nix if customized) - -### Terminal Handling: -If you were using a specific terminal in 2.3: -- **Kitty**: Already enabled by default in 2.4 -- **Alacritty**: Script automatically enables `alacrittyEnable = true` -- **WezTerm**: Script automatically enables `weztermEnable = true` -- **Ghostty**: Script automatically enables `ghosttyEnable = true` - -## ⚠️ Important Notes - -### SDDM Display Manager -- 2.4 uses SDDM as default login manager -- The upgrade uses `boot` instead of `switch` to prevent display issues -- You **must reboot** after upgrade - don't use `switch` command - -### Backup Location -Your backup is stored at: -``` -~/.config/zaneyos-backups/zaneyos-2.3-upgrade-backup-TIMESTAMP/ -``` - -## 🔄 How to Revert - -If you encounter any issues, you can easily revert: - -### Option 1: Use the Revert Script -```bash -cd ~/zaneyos -./revert-to-2.3.sh -``` - -### Option 2: Use the Main Script -```bash -cd ~/zaneyos -./upgrade-2.3-to-2.4.sh --revert -``` - -### Option 3: Manual Revert -1. Remove current zaneyos directory: `rm -rf ~/zaneyos` -2. Restore from backup: `cp -r ~/.config/zaneyos-backups/[backup-name]/zaneyos ~/` -3. Rebuild system: `nh os boot ~/zaneyos --hostname [profile]` -4. Reboot system - -## 🔍 Troubleshooting - -### Build Failures -- Check the log file (location shown in script output) -- Ensure you have sufficient disk space -- Try the revert option and report the issue - -### Display Issues After Reboot -- If you get a blank screen, wait a few moments for SDDM to start -- You can switch to TTY (Ctrl+Alt+F2) if needed -- Login and run `systemctl status display-manager` - -### Missing Applications -- Check if your preferred terminal is enabled in `~/zaneyos/hosts/[hostname]/variables.nix` -- Verify browser and other applications are still available -- Some applications may need to be re-enabled in the new configuration - -### Log File Location -Each run creates a log file at: `~/zaneyos-upgrade-TIMESTAMP.log` - -## 📁 File Structure After Upgrade - -Your host configuration will be updated with new 2.4 structure: -``` -~/zaneyos/hosts/[your-hostname]/ -├── hardware.nix (preserved from 2.3) -└── variables.nix (updated to 2.4 format with your settings) -``` - -## 🆘 Emergency Recovery - -If something goes very wrong: -1. Your complete 2.3 backup is preserved -2. Boot from NixOS live USB if needed -3. Mount your system and restore the backup -4. All your data and configuration is safe - -## ✅ Post-Upgrade Checklist - -After successful upgrade and reboot: -- [ ] SDDM login screen appears -- [ ] Desktop environment loads correctly -- [ ] Preferred terminal opens and works -- [ ] Browser launches correctly -- [ ] Custom wallpaper/theme preserved -- [ ] Monitor configuration correct -- [ ] All needed applications available - -## 🤝 Getting Help - -If you encounter issues: -1. Check the log file for error details -2. Try the revert option to restore 2.3 -3. Report issues with log file contents -4. Your backup is always available for manual recovery - ---- - -## Script Files - -- **`upgrade-2.3-to-2.4.sh`** - Main upgrade script -- **`revert-to-2.3.sh`** - Simple revert wrapper -- **`UPGRADE-2.3-to-2.4.md`** - This documentation - -Remember: The upgrade creates a complete backup before making any changes, so your system is always recoverable. diff --git a/modules/src/ZaneyOS-Upgrade.es.md b/modules/src/ZaneyOS-Upgrade.es.md deleted file mode 100644 index e0b0e42..0000000 --- a/modules/src/ZaneyOS-Upgrade.es.md +++ /dev/null @@ -1,147 +0,0 @@ -[English](ZaneyOS-Upgrade.md) | [Español](ZaneyOS-Upgrade.es.md) - -# 🚀 Procedimiento de Actualización de ZaneyOS - -## ⚠️ DEPRECADO - Usa el nuevo sistema de actualización automatizado - -> **IMPORTANTE:** -> -> Este procedimiento manual ha sido **reemplazado** por un sistema automatizado mucho más seguro y completo. -> -> **Usa el nuevo sistema:** -> - Revisa: `UPGRADE-2.3-to-2.4.md` (documentación completa) -> - Ejecuta: `./upgrade-2.3-to-2.4.sh` (actualización automatizada) -> - Incluye respaldos automáticos, migración de variables y reversión sencilla - ---- - -## 🆕 Nuevo Sistema Automatizado - -Proporciona: -- **Respaldo completo** antes de cambios -- **Migración automática** de variables 2.3 → 2.4 (15+ variables) -- **Manejo de terminales** crítico para 2.4 -- **Build seguro** con `boot` para evitar problemas visuales -- **Reversión con un comando** si algo falla -- **Logs** completos para diagnóstico - -### Inicio Rápido -```bash -# Obtén el script sin modificar tu repo -git -C ~/zaneyos fetch origin && \ - git -C ~/zaneyos show origin/main:upgrade-2.3-to-2.4.sh > ~/upgrade-2.3-to-2.4.sh && \ - chmod +x ~/upgrade-2.3-to-2.4.sh - -# Ejecuta el script (crea respaldo completo antes de cambiar ramas) -~/upgrade-2.3-to-2.4.sh -``` - -Alternativa (curl): -```bash -curl -fsSL https://gitlab.com/zaney/zaneyos/-/raw/main/upgrade-2.3-to-2.4.sh -o ~/upgrade-2.3-to-2.4.sh -chmod +x ~/upgrade-2.3-to-2.4.sh -~/upgrade-2.3-to-2.4.sh -``` - -### Instrucciones Detalladas -```bash -less UPGRADE-2.3-to-2.4.md -``` - ---- - -## ⚠️ ¿Por qué usar el sistema nuevo? - -El proceso manual es **incompleto y riesgoso** porque: -- ❌ Maneja pocas variables (2.4 añade 15+) -- ❌ No hay respaldo automático -- ❌ No maneja dependencias de terminal -- ❌ No hay opción de revertir si falla -- ❌ Faltan variables críticas como `doomEmacsEnable`, monitores, tema -- ❌ Referencias desactualizadas (`fr`, `fu` en vez de `zcli`) - ---- - -# 📜 Procedimiento Manual Original (DEPRECADO) - -> **⚠️ ADVERTENCIA:** Proceso manual desactualizado e incompleto. -> **Usa el sistema automatizado indicado arriba.** - ---- - -### 1. 📝 Preparación - -1. **Asegura que tu ZaneyOS actual esté al día:** - - Ve a tu carpeta ZaneyOS: - ```bash - cd ~/zaneyos - ``` - - Si tienes cambios sin commit, súbelos primero. - - Trae los últimos cambios: - ```bash - git stash && git fetch && git pull - ``` - - Verifica que host y GPU en `flake.nix` coincidan con tu sistema. - - Puedes editarlos manualmente. - - Dependiendo de tu build actual, quizá puedas ejecutar `zcli update-host`. - - Si hay cambios, reconstruye y reinicia (`zcli rebuild`). - -2. **Respalda tu directorio actual:** - ```bash - mv ~/zaneyos ~/zaneyos-backup - ``` - -3. **Clona la rama v2.4:** - ```bash - git clone https://gitlab.com/zaney/zaneyos.git -b Stable-2.4 --depth=1 - cd ~/zaneyos - ``` - ---- - -### 2. 🔄 Convertir hosts 2.3 a 2.4 - -- **Nuevas opciones en `hosts//variables.nix`:** - ```nix - displayManager = "sddm"; - tmuxEnable = false; - alacrittyEnable = false; - weztermEnable = false; - ghosttyEnable = false; - vscodeEnable = false; - helixEnable = false; - ``` - -- **Pasos de migración:** - 1. Copia la plantilla `hosts/default` a tu hostname - 2. Copia `hardware.nix` desde el respaldo - 3. `git add .` - 4. Integra tus personalizaciones manualmente en el nuevo layout (no sobrescribas archivos 2.4) - ---- - -### 3. ✅ Probar la Configuración - -1. Verifica `flake.nix` (hostname y GPU). Si tienes `zcli update-host`, úsalo. -2. Ejecuta: - ```bash - nix flake check - ``` - ---- - -### 4. ⬆️ Ejecutar la Actualización - -> ⚠️ **CRÍTICO:** -> - No uses `fr`, `fu` ni `zcli` para este paso final. -> - Podría provocar un crash de Hyprland al reiniciar el display manager. - -1. Ejecuta desde `~/zaneyos`: - ```bash - sudo nixos-rebuild boot --flake .#PROFILE - ``` -2. Reinicia. - ---- - -### 🎉 ¡Bienvenido a ZaneyOS v2.4! diff --git a/modules/src/ZaneyOS-Upgrade.md b/modules/src/ZaneyOS-Upgrade.md deleted file mode 100644 index 0ce55c4..0000000 --- a/modules/src/ZaneyOS-Upgrade.md +++ /dev/null @@ -1,189 +0,0 @@ -[English](ZaneyOS-Upgrade.md) | [Español](ZaneyOS-Upgrade.es.md) - -# 🚀 ZaneyOS Upgrade Procedure - -## ⚠️ DEPRECATED - Use New Automated Upgrade System - -> **IMPORTANT:** -> -> This manual upgrade procedure has been **replaced** by a much safer and more comprehensive automated upgrade system. -> -> **Please use the new upgrade system instead:** -> - See: `UPGRADE-2.3-to-2.4.md` for complete documentation -> - Run: `./upgrade-2.3-to-2.4.sh` for automated upgrade -> - The new system includes automatic backups, variable migration, and easy revert options - ---- - -## 🆕 New Automated Upgrade System - -The new upgrade system provides: -- **Complete backup** of your current system before any changes -- **Automatic variable migration** from 2.3 to 2.4 format (handles 15+ variables) -- **Terminal dependency handling** (critical for 2.4 compatibility) -- **Safe build process** using `boot` instead of `switch` to avoid display issues -- **One-command revert** if anything goes wrong -- **Comprehensive logging** for troubleshooting - -### Quick Start: -```bash -# Safely obtain the script without modifying your repo -git -C ~/zaneyos fetch origin && \ - git -C ~/zaneyos show origin/main:upgrade-2.3-to-2.4.sh > ~/upgrade-2.3-to-2.4.sh && \ - chmod +x ~/upgrade-2.3-to-2.4.sh - -# Run the script (it will create a full backup before changing branches) -~/upgrade-2.3-to-2.4.sh -``` - -Alternative (curl): -```bash -curl -fsSL https://gitlab.com/zaney/zaneyos/-/raw/main/upgrade-2.3-to-2.4.sh -o ~/upgrade-2.3-to-2.4.sh -chmod +x ~/upgrade-2.3-to-2.4.sh -~/upgrade-2.3-to-2.4.sh -``` - -### For detailed instructions: -```bash -less UPGRADE-2.3-to-2.4.md -``` - ---- - -## ⚠️ Why Use the New System? - -The manual process below is **incomplete and risky** because: -- ❌ Only handles 6 variables (actual 2.4 has 15+ new variables) -- ❌ No automatic backup system -- ❌ No terminal dependency handling -- ❌ No revert option if things go wrong -- ❌ Missing critical variables like `doomEmacsEnable`, monitor settings, theme configuration -- ❌ References outdated commands (`fr`, `fu` instead of `zcli`) - ---- - -# 📜 Original Manual Procedure (DEPRECATED) - -> **⚠️ WARNING: This manual procedure is outdated and incomplete.** -> **Use the automated upgrade system above instead.** - ---- - -### 1. 📝 Prepare for Upgrade - -1. **Ensure your current ZaneyOS is up-to-date:** - - Navigate to your ZaneyOS directory: - ```bash - cd ~/zaneyos - ``` - - If you have any uncommitted changes, commit and push them. - - Fetch the latest changes: - ```bash - git stash && git fetch && git pull - ``` - - Verify that your current host and GPU in `flake.nix` match your system. - - You can edit `flake.nix` manually. - - Depending on your current build, you might be able to run - `zcli update-host`. - - If there are any changes, perform a rebuild and reboot: - - Use `fr` or `zcli rebuild`. - -2. **Backup your current ZaneyOS directory:** - ```bash - mv ~/zaneyos ~/zaneyos-backup - ``` - -3. **Clone the v2.4 branch:** - ```bash - git clone https://gitlab.com/zaney/zaneyos.git -b Stable-2.4 --depth=1 - cd ~/zaneyos - ``` - ---- - -### 2. 🔄 Converting v2.3 Hosts to v2.4 - -ZaneyOS v2.4 introduces new features in the host configuration, giving you more -control. This requires a manual update to your host files. - -- **New options in `hosts/hostname/variables.nix`:** - - ```nix - # Set Display Manager: `tui` for Text, `sddm` for graphical GUI - # SDDM background is set with stylixImage - displayManager = "sddm"; - - # Enable/disable bundled applications - tmuxEnable = false; - alacrittyEnable = false; - weztermEnable = false; - ghosttyEnable = false; - vscodeEnable = false; - helixEnable = false; - ``` - -- **Migration Steps:** - - 1. **Copy the `default` host template** to a new directory named after your - host: - ```bash - # Replace YOURHOSTNAME with your actual hostname - cp -r ~/zaneyos/hosts/default ~/zaneyos/hosts/YOURHOSTNAME - ``` - _Example:_ If your hostname is `nixos`: - ```bash - cp -r ~/zaneyos/hosts/default ~/zaneyos/hosts/nixos - ``` - - 2. **Copy the hardware configuration** from your backup: - ```bash - # Replace nixos with your hostname if different - cp ~/zaneyos-backup/hosts/nixos/hardware.nix ~/zaneyos/hosts/nixos/hardware.nix - ``` - - 3. ❗ **IMPORTANT:** In the `zaneyos` directory, stage your changes: - ```bash - git add . - ``` - - 4. **Manually edit your new host files** (`~/zaneyos/hosts/YOURHOSTNAME`) to - include any personal customizations (e.g., monitor settings, extra - packages). - > ⚠️ **Warning:** Do **NOT** copy/restore your old host files directly! You - > must integrate your changes into the new v2.4 file structure. - ---- - -### 3. ✅ Test the Configuration - -1. **Verify `flake.nix`:** Ensure your hostname and GPU type are set correctly. - - If you are unsure and your version has it available, run: - `zcli update-host` - -2. **Run a configuration check** from the `zaneyos` directory: - ```bash - nix flake check - ``` - - If there are no errors, you can proceed to the final step. - ---- - -### 4. ⬆️ Running the Upgrade - -> ⚠️ **CRITICAL WARNING:** -> -> - Do **NOT** use `fr`, `fu`, or `zcli` for this final upgrade step. -> - Doing so will cause Hyprland to crash when the display manager (greetd or -> SDDM) restarts during the switch. - -1. **Execute the rebuild command** from the `zaneyos` directory: - ```bash - # Replace PROFILE with your GPU (e.g., amd, intel, nvidia, vm) - sudo nixos-rebuild boot --flake .#PROFILE - ``` - -2. **Reboot your system** once the update is complete. - ---- - -### 🎉 Enjoy! Welcome to ZaneyOS v2.4! diff --git a/modules/src/compare-zaneyos-config.sh b/modules/src/compare-zaneyos-config.sh deleted file mode 100755 index 2fe7eea..0000000 --- a/modules/src/compare-zaneyos-config.sh +++ /dev/null @@ -1,465 +0,0 @@ -#!/usr/bin/env bash - -########################################## -# ZaneyOS Configuration Comparison Tool -# Author: Don Williams -# Date: $(date +"%B %d, %Y") -########################################## - -# Define colors -RED='\033[0;31m' -GREEN='\033[0;32m' -YELLOW='\033[1;33m' -BLUE='\033[0;34m' -CYAN='\033[0;36m' -PURPLE='\033[0;35m' -NC='\033[0m' # No Color - -# Define directories -ZANEYOS_DIR="$HOME/zaneyos" -TEMP_DIR="/tmp/zaneyos-comparison-$$" -TIMESTAMP=$(date +"%Y-%m-%d_%H-%M-%S") -REPORT_FILE="$HOME/zaneyos-config-comparison-$TIMESTAMP.txt" - -# Default comparison targets -DEFAULT_REPO="https://gitlab.com/zaney/zaneyos.git" -DEFAULT_BRANCH="main" - -# Function to print a section header -print_header() { - echo -e "${BLUE}╔═══════════════════════════════════════════════════════════════════════╗${NC}" - echo -e "${BLUE}║ ${1} ${NC}" - echo -e "${BLUE}╚═══════════════════════════════════════════════════════════════════════╝${NC}" -} - -# Function to print an error message -print_error() { - echo -e "${RED}❌ Error: ${1}${NC}" -} - -# Function to print a warning message -print_warning() { - echo -e "${YELLOW}⚠️ Warning: ${1}${NC}" -} - -# Function to print a success message -print_success() { - echo -e "${GREEN}✅ ${1}${NC}" -} - -# Function to print an info message -print_info() { - echo -e "${CYAN}ℹ️ ${1}${NC}" -} - -# Function to show usage -show_usage() { - echo -e "${CYAN}ZaneyOS Configuration Comparison Tool${NC}" - echo "" - echo "Usage: $0 [OPTIONS]" - echo "" - echo "Options:" - echo " -r, --repo URL Remote repository URL to compare against" - echo " (default: https://gitlab.com/zaney/zaneyos.git)" - echo " -b, --branch NAME Branch to compare against (default: main)" - echo " -o, --output FILE Output report file path" - echo " -h, --help Show this help message" - echo "" - echo "Examples:" - echo " $0 # Compare against official main branch" - echo " $0 -r https://github.com/user/zaneyos.git -b dev" - echo " $0 --branch stable-2.4 # Compare against specific branch" - echo " $0 --output my-comparison.txt # Custom output file" - echo "" -} - -# Parse command line arguments -REPO_URL="$DEFAULT_REPO" -BRANCH="$DEFAULT_BRANCH" - -while [[ $# -gt 0 ]]; do - case $1 in - -r|--repo) - REPO_URL="$2" - shift 2 - ;; - -b|--branch) - BRANCH="$2" - shift 2 - ;; - -o|--output) - REPORT_FILE="$2" - shift 2 - ;; - -h|--help) - show_usage - exit 0 - ;; - *) - print_error "Unknown option: $1" - show_usage - exit 1 - ;; - esac -done - -# Function to cleanup on exit -cleanup() { - if [ -d "$TEMP_DIR" ]; then - rm -rf "$TEMP_DIR" - fi -} -trap cleanup EXIT - -# Main comparison function -perform_comparison() { - print_header "ZaneyOS Configuration Comparison Tool" - - echo -e "${CYAN}🔍 Comparing your configuration against:${NC}" - echo -e " Repository: ${YELLOW}$REPO_URL${NC}" - echo -e " Branch: ${YELLOW}$BRANCH${NC}" - echo -e " Report: ${YELLOW}$REPORT_FILE${NC}" - echo "" - - # Check if we're in a zaneyos directory - if [ ! -d "$ZANEYOS_DIR" ]; then - print_error "ZaneyOS directory not found at $ZANEYOS_DIR" - exit 1 - fi - - cd "$ZANEYOS_DIR" || exit 1 - - # Check if current directory is a git repository - if [ ! -d ".git" ]; then - print_warning "Current ZaneyOS directory is not a git repository" - print_info "This tool works best when your ZaneyOS is version controlled" - fi - - # Clone the comparison repository - print_info "Cloning comparison repository..." - mkdir -p "$TEMP_DIR" - if ! git clone --depth=1 -b "$BRANCH" "$REPO_URL" "$TEMP_DIR/reference" 2>/dev/null; then - print_error "Failed to clone repository: $REPO_URL (branch: $BRANCH)" - print_info "Please check the repository URL and branch name" - exit 1 - fi - - print_success "Successfully cloned reference repository" - - # Generate comparison report - { - echo "============================================" - echo " ZaneyOS Configuration Comparison Report" - echo " Generated: $(date)" - echo " Local: $ZANEYOS_DIR" - echo " Remote: $REPO_URL (branch: $BRANCH)" - echo "============================================" - echo "" - - # Compare flake.nix - echo "🔧 FLAKE.NIX COMPARISON:" - echo "========================" - if [ -f "./flake.nix" ] && [ -f "$TEMP_DIR/reference/flake.nix" ]; then - if cmp -s "./flake.nix" "$TEMP_DIR/reference/flake.nix"; then - echo "✅ flake.nix is identical to reference" - else - echo "📝 flake.nix differences detected:" - echo "" - echo "--- Reference (official)" - echo "+++ Your configuration" - diff -u "$TEMP_DIR/reference/flake.nix" "./flake.nix" || true - fi - else - echo "⚠️ Could not compare flake.nix (file missing)" - fi - echo "" - - # Compare global packages - echo "📦 GLOBAL PACKAGES COMPARISON:" - echo "==============================" - if [ -f "./modules/core/packages.nix" ] && [ -f "$TEMP_DIR/reference/modules/core/packages.nix" ]; then - if cmp -s "./modules/core/packages.nix" "$TEMP_DIR/reference/modules/core/packages.nix"; then - echo "✅ modules/core/packages.nix is identical to reference" - else - echo "📝 Global packages differences detected:" - echo "" - echo "--- Reference (official)" - echo "+++ Your configuration" - diff -u "$TEMP_DIR/reference/modules/core/packages.nix" "./modules/core/packages.nix" || true - fi - else - echo "⚠️ Could not compare global packages (file missing)" - fi - echo "" - - # Compare host configurations - echo "🏠 HOST CONFIGURATIONS COMPARISON:" - echo "==================================" - - # List your hosts vs reference hosts - echo "📂 Your hosts:" - for dir in hosts/*/; do - hostname=$(basename "$dir") - if [ "$hostname" != "default" ]; then - echo " • $hostname" - fi - done - echo "" - - echo "📂 Reference hosts:" - for dir in "$TEMP_DIR/reference/hosts/"*/; do - hostname=$(basename "$dir") - if [ "$hostname" != "default" ]; then - echo " • $hostname" - fi - done - echo "" - - # Compare default host template - echo "📋 Default host template comparison:" - if [ -d "./hosts/default" ] && [ -d "$TEMP_DIR/reference/hosts/default" ]; then - for file in variables.nix hardware.nix host-packages.nix default.nix; do - if [ -f "./hosts/default/$file" ] && [ -f "$TEMP_DIR/reference/hosts/default/$file" ]; then - if cmp -s "./hosts/default/$file" "$TEMP_DIR/reference/hosts/default/$file"; then - echo " ✅ default/$file is identical" - else - echo " 📝 default/$file has differences:" - echo " (This is normal if you've customized the default template)" - fi - fi - done - fi - echo "" - - # Compare your custom hosts against default template - echo "🔍 YOUR CUSTOM HOST ANALYSIS:" - echo "==========================" - for dir in hosts/*/; do - hostname=$(basename "$dir") - if [ "$hostname" != "default" ]; then - echo "📋 Host: $hostname" - - # Compare each file against the reference default - for file in variables.nix hardware.nix host-packages.nix default.nix; do - local_file="./hosts/$hostname/$file" - ref_default="$TEMP_DIR/reference/hosts/default/$file" - - if [ -f "$local_file" ] && [ -f "$ref_default" ]; then - if cmp -s "$local_file" "$ref_default"; then - echo " ✅ $file: Using default template" - else - echo " 📝 $file: Customized (differs from default template)" - - # Show key customizations for variables.nix - if [ "$file" = "variables.nix" ]; then - echo " 🔍 Key customizations detected:" - - # Extract important variables - git_user=$(grep 'gitUsername' "$local_file" 2>/dev/null | sed 's/.*= *"\([^"]*\)".*/\1/' || echo "not set") - git_email=$(grep 'gitEmail' "$local_file" 2>/dev/null | sed 's/.*= *"\([^"]*\)".*/\1/' || echo "not set") - browser=$(grep 'browser' "$local_file" 2>/dev/null | sed 's/.*= *"\([^"]*\)".*/\1/' || echo "default") - terminal=$(grep 'terminal' "$local_file" 2>/dev/null | sed 's/.*= *"\([^"]*\)".*/\1/' || echo "default") - - echo " • Git User: $git_user" - echo " • Git Email: $git_email" - echo " • Browser: $browser" - echo " • Terminal: $terminal" - fi - fi - elif [ -f "$local_file" ]; then - echo " ℹ️ $file: Custom file (not in reference)" - else - echo " ⚠️ $file: Missing" - fi - done - echo "" - fi - done - - # Compare shell configurations - echo "🐚 SHELL CONFIGURATIONS COMPARISON:" - echo "=================================" - - # Check common shell customization files - shell_files=( - "modules/home/zsh/default.nix" - "modules/home/zsh/zshrc-personal.nix" - "modules/home/bash.nix" - "modules/home/bashrc-personal.nix" - "modules/home/eza.nix" - ) - - for file in "${shell_files[@]}"; do - if [ -f "./$file" ]; then - if [ -f "$TEMP_DIR/reference/$file" ]; then - if cmp -s "./$file" "$TEMP_DIR/reference/$file"; then - echo "✅ $file: Identical to reference" - else - echo "📝 $file: Customized" - fi - else - echo "ℹ️ $file: Personal file (not in reference)" - fi - elif [ -f "$TEMP_DIR/reference/$file" ]; then - echo "⚠️ $file: Missing (exists in reference)" - fi - done - echo "" - - # File count comparison - echo "📊 REPOSITORY STATISTICS:" - echo "=======================" - local_files=$(find . -name "*.nix" -type f | wc -l) - ref_files=$(find "$TEMP_DIR/reference" -name "*.nix" -type f | wc -l) - - echo "📁 .nix files in your config: $local_files" - echo "📁 .nix files in reference: $ref_files" - - if [ "$local_files" -gt "$ref_files" ]; then - echo "📈 You have $((local_files - ref_files)) more .nix files than reference" - echo " This might indicate custom modules or configurations" - elif [ "$local_files" -lt "$ref_files" ]; then - echo "📉 You have $((ref_files - local_files)) fewer .nix files than reference" - echo " This might indicate missing features or modules" - else - echo "📊 Same number of .nix files as reference" - fi - echo "" - - # Git status if available - if [ -d ".git" ]; then - echo "🔄 GIT REPOSITORY STATUS:" - echo "=======================" - - # Current branch - current_branch=$(git branch --show-current 2>/dev/null || echo "unknown") - echo "📍 Current branch: $current_branch" - - # Commit information - if git rev-parse HEAD >/dev/null 2>&1; then - last_commit=$(git log -1 --format="%h - %s (%cr)" 2>/dev/null || echo "unknown") - echo "📝 Last commit: $last_commit" - - # Check for uncommitted changes - if ! git diff-index --quiet HEAD -- 2>/dev/null; then - echo "⚠️ Uncommitted changes detected:" - git status --porcelain | head -10 | sed 's/^/ /' - uncommitted_count=$(git status --porcelain | wc -l) - if [ "$uncommitted_count" -gt 10 ]; then - echo " ... and $((uncommitted_count - 10)) more files" - fi - else - echo "✅ No uncommitted changes" - fi - - # Remote information - remote_url=$(git remote get-url origin 2>/dev/null || echo "no remote") - echo "🌐 Remote origin: $remote_url" - fi - else - echo "🔄 GIT REPOSITORY STATUS:" - echo "=======================" - echo "⚠️ Not a git repository" - echo "💡 Consider initializing git for better version control:" - echo " git init" - echo " git add ." - echo " git commit -m 'Initial ZaneyOS configuration'" - fi - echo "" - - # Summary and recommendations - echo "============================================" - echo "📋 SUMMARY & RECOMMENDATIONS:" - echo "============================================" - echo "" - echo "🎯 CONFIGURATION ASSESSMENT:" - - # Count differences - different_files=0 - if [ -f "./flake.nix" ] && [ -f "$TEMP_DIR/reference/flake.nix" ] && ! cmp -s "./flake.nix" "$TEMP_DIR/reference/flake.nix"; then - ((different_files++)) - fi - if [ -f "./modules/core/packages.nix" ] && [ -f "$TEMP_DIR/reference/modules/core/packages.nix" ] && ! cmp -s "./modules/core/packages.nix" "$TEMP_DIR/reference/modules/core/packages.nix"; then - ((different_files++)) - fi - - if [ "$different_files" -eq 0 ]; then - echo "✅ Your configuration appears to be standard/minimal customization" - echo " • Upgrade should be straightforward" - echo " • Most settings will migrate automatically" - elif [ "$different_files" -le 2 ]; then - echo "📝 Your configuration has moderate customizations" - echo " • Upgrade should work well with some manual review" - echo " • Check the differences above for manual merge items" - else - echo "🔧 Your configuration is heavily customized" - echo " • Upgrade will require careful manual review" - echo " • Consider the git commands below for detailed analysis" - fi - echo "" - - echo "💡 RECOMMENDED ACTIONS:" - if [ -d ".git" ]; then - echo "1. Review differences in this report" - echo "2. Use git commands for detailed file-by-file comparison:" - echo " git remote add upstream $REPO_URL" - echo " git fetch upstream" - echo " git diff upstream/$BRANCH...HEAD" - echo "3. For specific files:" - echo " git diff upstream/$BRANCH:flake.nix flake.nix" - echo " git diff upstream/$BRANCH:modules/core/packages.nix modules/core/packages.nix" - else - echo "1. Consider initializing git for better version control" - echo "2. Review differences in this report" - echo "3. Back up your configuration before any upgrades" - fi - echo "" - - echo "🔄 FOR UPGRADING TO ZANEYOS 2.4:" - echo "1. Run the upgrade analysis: ./upgrade-2.3-to-2.4.sh" - echo "2. Review the pre-upgrade analysis report" - echo "3. Use this comparison report to understand your customizations" - echo "4. Proceed with the automated upgrade if ready" - echo "" - - echo "============================================" - echo "End of Comparison Report" - echo "============================================" - - } | tee "$REPORT_FILE" - - print_success "Comparison complete! Report saved to: $REPORT_FILE" - - # Offer to show git commands for further analysis - if [ -d ".git" ]; then - echo "" - read -p "Would you like to see detailed git comparison commands? (Y/N): " -n 1 -r - echo "" - if [[ $REPLY =~ ^[Yy]$ ]]; then - echo -e "${CYAN}🔍 Git Commands for Detailed Analysis:${NC}" - echo "" - echo -e "${YELLOW}1. Add upstream remote (if not already added):${NC}" - echo " git remote add upstream $REPO_URL" - echo "" - echo -e "${YELLOW}2. Fetch latest changes:${NC}" - echo " git fetch upstream" - echo "" - echo -e "${YELLOW}3. Compare your entire config vs upstream:${NC}" - echo " git diff upstream/$BRANCH...HEAD" - echo "" - echo -e "${YELLOW}4. Compare specific files:${NC}" - echo " git diff upstream/$BRANCH:flake.nix flake.nix" - echo " git diff upstream/$BRANCH:modules/core/packages.nix modules/core/packages.nix" - echo "" - echo -e "${YELLOW}5. See what files you've modified:${NC}" - echo " git diff --name-only upstream/$BRANCH...HEAD" - echo "" - echo -e "${YELLOW}6. View your commit history vs upstream:${NC}" - echo " git log --oneline upstream/$BRANCH..HEAD" - echo "" - fi - fi -} - -# Main execution -perform_comparison diff --git a/modules/src/revert-to-2.3.sh b/modules/src/revert-to-2.3.sh deleted file mode 100755 index 28fdade..0000000 --- a/modules/src/revert-to-2.3.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -########################################## -# ZaneyOS Revert Script: 2.4 → 2.3 -# Author: Don Williams -# This is a simple wrapper for the revert functionality -########################################## - -# Define colors -RED='\033[0;31m' -GREEN='\033[0;32m' -YELLOW='\033[1;33m' -BLUE='\033[0;34m' -CYAN='\033[0;36m' -NC='\033[0m' # No Color - -echo -e "${BLUE}╔═══════════════════════════════════════════════════════════════════════╗${NC}" -echo -e "${BLUE}║ ZaneyOS 2.4 → 2.3 Revert Script ║${NC}" -echo -e "${BLUE}╚═══════════════════════════════════════════════════════════════════════╝${NC}" - -echo "" -echo -e "${YELLOW}⚠️ This will revert your ZaneyOS installation from 2.4 back to 2.3${NC}" -echo -e "${CYAN}ℹ️ This uses your upgrade backup to restore the previous configuration${NC}" -echo "" - -# Check if the main upgrade script exists -UPGRADE_SCRIPT="./upgrade-2.3-to-2.4.sh" -if [ ! -f "$UPGRADE_SCRIPT" ]; then - echo -e "${RED}❌ Error: upgrade-2.3-to-2.4.sh not found in current directory${NC}" - echo -e "${CYAN}Please ensure you're in the ~/zaneyos directory${NC}" - exit 1 -fi - -# Check if it's executable -if [ ! -x "$UPGRADE_SCRIPT" ]; then - echo -e "${YELLOW}⚠️ Making upgrade script executable...${NC}" - chmod +x "$UPGRADE_SCRIPT" -fi - -# Ensure the upgrade script targets the stable 2.4 branch for consistency -export BRANCH="${BRANCH:-stable-2.4}" - -# Run the revert function -echo -e "${GREEN}🔄 Starting revert process...${NC}" -"$UPGRADE_SCRIPT" --revert diff --git a/modules/src/upgrade-2.3-to-2.4.sh b/modules/src/upgrade-2.3-to-2.4.sh deleted file mode 100755 index 7446b5f..0000000 --- a/modules/src/upgrade-2.3-to-2.4.sh +++ /dev/null @@ -1,1020 +0,0 @@ -#!/usr/bin/env bash - -########################################## -# ZaneyOS Upgrade Script: 2.3 → 2.4 -# Author: Don Williams -# Date: $(date +"%B %d, %Y") -########################################## - -# Define colors -RED='\033[0;31m' -GREEN='\033[0;32m' -YELLOW='\033[1;33m' -BLUE='\033[0;34m' -CYAN='\033[0;36m' -NC='\033[0m' # No Color - -# Define directories -ZANEYOS_DIR="$HOME/zaneyos" -BACKUP_BASE_DIR="$HOME/.config/zaneyos-backups" -TIMESTAMP=$(date +"%Y-%m-%d_%H-%M-%S") -BACKUP_DIR="$BACKUP_BASE_DIR/zaneyos-2.3-upgrade-backup-$TIMESTAMP" - -# Target branch for 2.4 release (override by exporting BRANCH) -BRANCH="${BRANCH:-stable-2.4}" - -# Define log file -LOG_FILE="$HOME/zaneyos-upgrade-$TIMESTAMP.log" - -# Redirect all output to log file while still showing on screen -exec > >(tee -a "$LOG_FILE") 2>&1 - -# Function to print a section header -print_header() { - echo -e "${BLUE}╔═══════════════════════════════════════════════════════════════════════╗${NC}" - echo -e "${BLUE}║ ${1} ${NC}" - echo -e "${BLUE}╚═══════════════════════════════════════════════════════════════════════╝${NC}" -} - -# Function to print an error message -print_error() { - echo -e "${RED}❌ Error: ${1}${NC}" -} - -# Function to print a warning message -print_warning() { - echo -e "${YELLOW}⚠️ Warning: ${1}${NC}" -} - -# Function to print a success message -print_success() { - echo -e "${GREEN}✅ ${1}${NC}" -} - -# Function to print an info message -print_info() { - echo -e "${CYAN}ℹ️ ${1}${NC}" -} - -# Function to create full backup -create_backup() { - print_header "Creating Complete Backup" - - if [ ! -d "$ZANEYOS_DIR" ]; then - print_error "ZaneyOS directory not found at $ZANEYOS_DIR" - return 1 - fi - - print_info "Creating backup directory: $BACKUP_DIR" - mkdir -p "$BACKUP_DIR" - - print_info "Copying entire zaneyos directory..." - if cp -r "$ZANEYOS_DIR" "$BACKUP_DIR/"; then - print_success "Backup created successfully at: $BACKUP_DIR" - echo -e "${GREEN}📁 Backup location: $BACKUP_DIR/zaneyos${NC}" - return 0 - else - print_error "Failed to create backup" - return 1 - fi -} - -# Function to revert from backup -revert_from_backup() { - print_header "Reverting from Backup" - - if [ ! -d "$BACKUP_DIR/zaneyos" ]; then - print_error "Backup not found at $BACKUP_DIR/zaneyos" - echo -e "${YELLOW}Available backups:${NC}" - ls -la "$BACKUP_BASE_DIR/" 2>/dev/null || echo "No backups found" - return 1 - fi - - print_warning "This will completely restore your ZaneyOS 2.3 configuration" - echo -e "${YELLOW}Current zaneyos directory will be replaced with backup${NC}" - - read -p "Are you sure you want to revert? (Y/N): " -n 1 -r - echo - if [[ ! $REPLY =~ ^[Yy]$ ]]; then - print_info "Revert cancelled" - return 1 - fi - - # Remove current directory - print_info "Removing current zaneyos directory..." - if [ -d "$ZANEYOS_DIR" ]; then - rm -rf "$ZANEYOS_DIR" - fi - - # Restore from backup - print_info "Restoring from backup..." - if cp -r "$BACKUP_DIR/zaneyos" "$HOME/"; then - print_success "Successfully reverted to ZaneyOS 2.3 backup" - - # Change to the restored directory - cd "$ZANEYOS_DIR" || return 1 - - # Get the profile from flake.nix - local profile=$(grep 'profile = ' ./flake.nix | sed 's/.*= *"\([^"]*\)".*/\1/') - - print_info "Rebuilding system with restored configuration..." - if command -v nh &> /dev/null; then - nh os boot ~/zaneyos --hostname "$profile" - else - sudo nixos-rebuild boot --flake ~/zaneyos/#"$profile" - fi - - if [ $? -eq 0 ]; then - print_success "System successfully reverted to ZaneyOS 2.3" - echo -e "${YELLOW}Please reboot to complete the reversion${NC}" - else - print_error "Failed to rebuild system after revert" - return 1 - fi - - return 0 - else - print_error "Failed to restore from backup" - return 1 - fi -} - -# Function to print success banner -print_success_banner() { - echo -e "${GREEN}╔═══════════════════════════════════════════════════════════════════════╗${NC}" - echo -e "${GREEN}║ ZaneyOS 2.4 Upgrade Successful! ║${NC}" - echo -e "${GREEN}║ ║${NC}" - echo -e "${GREEN}║ 🎉 Your system has been upgraded to ZaneyOS 2.4 ║${NC}" - echo -e "${GREEN}║ 🔄 Please reboot your system for changes to take full effect ║${NC}" - echo -e "${GREEN}║ 🖥️ SDDM is now the default display manager ║${NC}" - echo -e "${GREEN}║ ║${NC}" - echo -e "${GREEN}╚═══════════════════════════════════════════════════════════════════════╝${NC}" -} - -# Function to print failure banner -print_failure_banner() { - echo -e "${RED}╔═══════════════════════════════════════════════════════════════════════╗${NC}" - echo -e "${RED}║ ZaneyOS 2.4 Upgrade Failed! ║${NC}" - echo -e "${RED}║ ║${NC}" - echo -e "${RED}║ Please review the log file for details: ║${NC}" - echo -e "${RED}║ ${LOG_FILE} ║${NC}" - echo -e "${RED}║ ║${NC}" - echo -e "${RED}╚═══════════════════════════════════════════════════════════════════════╝${NC}" -} - -# Cleanup helper: remove duplicate attribute keys in variables.nix -cleanup_duplicates() { - local file_path="$1" - # Keep only the first non-comment occurrence of specific keys - awk ' - BEGIN{si=0; ac=0; wc=0} - /^[[:space:]]*stylixImage[[:space:]]*=/ { if (si++) next } - /^[[:space:]]*animChoice[[:space:]]*=/ { if (ac++) next } - /^[[:space:]]*waybarChoice[[:space:]]*=/ { if (wc++) next } - { print } - ' "$file_path" > "$file_path.tmp" && mv "$file_path.tmp" "$file_path" -} - -# Prompt helpers for non-interactive mode -prompt_yes() { - local message="$1" - if [ "${AUTO_YES:-}" = "1" ]; then - echo -e "$message Y" - REPLY=Y - else - read -p "$message " -n 1 -r - echo "" - fi -} - -prompt_choice() { - # $1: prompt message, $2: default uppercase letter (e.g., S or R) - local message="$1" - local default_char="$2" - if [ "${AUTO_YES:-}" = "1" ]; then - echo -e "$message $default_char" - choice="$default_char" - else - read -p "$message " -r choice - fi -} - -# Git helper: switch to target branch safely even with uncommitted changes -switch_to_main_handling_dirty() { - # Fetch target branch from origin - print_info "Fetching latest changes from origin ($BRANCH)..." - # Fetch branch ref into FETCH_HEAD (works even if remote-tracking branch isn't configured) - if ! git fetch origin "$BRANCH"; then - print_error "Failed to fetch origin/$BRANCH" - exit 1 - fi - - # Handle dirty worktree - if ! git diff-index --quiet HEAD -- 2>/dev/null; then - print_warning "UNCOMMITTED CHANGES DETECTED!" - echo "You can:" - echo " • [S]tash changes (default)" - echo " • [D]iscard changes (reset hard)" - echo " • [A]bort upgrade" - prompt_choice "Choose action [S/d/a]:" "S" - case "${choice^^}" in - D) - print_warning "Discarding local changes (git reset --hard && git clean -fd)" - git reset --hard || { print_error "git reset failed"; exit 1; } - git clean -fd || { print_error "git clean failed"; exit 1; } - ;; - A) - print_info "Upgrade cancelled by user due to uncommitted changes." - exit 0 - ;; - *) - local stash_name="pre-upgrade-stash-$(date +%F_%H-%M-%S)" - if git stash -u -m "$stash_name"; then - print_success "Changes stashed as: $stash_name" - else - print_error "Failed to stash changes" - exit 1 - fi - ;; - esac - fi - - # Create or reset local branch to fetched commit (FETCH_HEAD) - if ! git checkout -B "$BRANCH" FETCH_HEAD; then - print_error "Failed to create/reset local $BRANCH from FETCH_HEAD" - exit 1 - fi - - # Set upstream if available, ignore errors if not - git branch --set-upstream-to="origin/$BRANCH" "$BRANCH" >/dev/null 2>&1 || true - - print_success "Successfully switched to ZaneyOS 2.4 ($BRANCH branch)" -} - -# Check command line arguments -if [ "$1" = "--revert" ]; then - revert_from_backup - exit $? -fi - -print_header "ZaneyOS 2.3 → 2.4 Upgrade Script" - -echo -e "${CYAN}🚀 Welcome to the ZaneyOS 2.4 Upgrade Script!${NC}" -echo "" -echo -e "${YELLOW}📋 This script will:${NC}" -echo -e " • Create a complete backup of your current system" -echo -e " • Verify you're currently running ZaneyOS 2.3" -echo -e " • Upgrade to ZaneyOS 2.4 from $BRANCH" -echo -e " • Merge new 2.4 variables into your host configuration" -echo -e " • Handle terminal dependencies automatically" -echo -e " • Use safe 'boot' option to avoid SDDM display issues" -echo -e " • Prompt for reboot after completion" -echo "" -echo -e "${CYAN}💾 Revert Instructions:${NC}" -echo -e " If something goes wrong, run: $0 --revert" -echo "" - -# Change to zaneyos directory -if [ ! -d "$ZANEYOS_DIR" ]; then - print_error "ZaneyOS directory not found at $ZANEYOS_DIR" - print_error "Please ensure ZaneyOS is installed at ~/zaneyos" - exit 1 -fi - -cd "$ZANEYOS_DIR" || exit 1 - -print_header "Pre-Flight Checks" - -# Check if we're in a ZaneyOS directory -if [ ! -f "./flake.nix" ] || [ ! -d "./hosts" ]; then - print_error "This doesn't appear to be a ZaneyOS directory." - print_error "Please ensure you're in the correct directory." - exit 1 -fi - -print_success "ZaneyOS directory structure detected" - -# Check if git is available -if ! command -v git &> /dev/null; then - print_error "Git is not installed." - exit 1 -fi - -print_success "Git is available" - -# Check if NH is available (we'll use it for the rebuild) -if ! command -v nh &> /dev/null; then - print_warning "NH (Nix Helper) not found. Will use nixos-rebuild directly." - USE_NH=false -else - print_success "NH (Nix Helper) detected" - USE_NH=true -fi - -print_header "Version Verification" - -# Check current branch/version -CURRENT_BRANCH=$(git branch --show-current) -print_info "Current branch: $CURRENT_BRANCH" - -# Verify this appears to be version 2.3 -if [ ! -f "./hosts/default/variables.nix" ]; then - print_error "Cannot find default variables.nix file" - exit 1 -fi - -# Check if we have 2.4 features (this indicates the TEMPLATE is 2.4) -# Do NOT abort: users may still have 2.3 host files to migrate. -if grep -q "displayManager" ./hosts/default/variables.nix; then - print_warning "Template variables.nix includes 2.4+ fields (displayManager found)." - print_info "Proceeding: we will still migrate host files from your 2.3 backup." -else - print_success "Verified: Template appears to be ZaneyOS 2.3-style" -fi - -# Comprehensive pre-check analysis -perform_precheck_analysis() { - local analysis_file="$HOME/zaneyos-upgrade-analysis-$TIMESTAMP.txt" - - print_header "Pre-Upgrade Analysis" - print_info "Analyzing your current ZaneyOS configuration..." - print_info "Analysis report will be saved to: $analysis_file" - - { - echo "============================================" - echo " ZaneyOS 2.3 → 2.4 Upgrade Analysis Report" - echo " Generated: $(date)" - echo " System: $(hostname)" - echo "============================================" - echo "" - - # Analyze flake.nix customizations - echo "🔧 FLAKE.NIX ANALYSIS:" - if [ -f "./flake.nix" ]; then - # Check for custom inputs - echo "📦 Custom Inputs Detected:" - custom_inputs=$(grep -A 20 "inputs = {" ./flake.nix | grep -v "nixpkgs\|home-manager\|hyprland\|stylix" | grep -E "\w+\.(url|github|gitlab)" || echo " None detected") - echo "$custom_inputs" - echo "" - - # Check current profile - current_profile=$(grep 'profile = ' ./flake.nix | sed 's/.*= *"\([^"]*\)".*/\1/' || echo "Unknown") - echo "📍 Current Profile: $current_profile" - echo "" - else - echo "❌ flake.nix not found" - fi - - # Analyze host configurations - echo "🏠 HOST CONFIGURATIONS ANALYSIS:" - host_count=0 - for dir in hosts/*/; do - hostname=$(basename "$dir") - if [ "$hostname" != "default" ]; then - ((host_count++)) - echo " 📂 Host: $hostname" - - # Check which files exist - [ -f "$dir/variables.nix" ] && echo " ✅ variables.nix (WILL BE MIGRATED)" - [ -f "$dir/hardware.nix" ] && echo " ✅ hardware.nix (WILL BE PRESERVED)" - [ -f "$dir/host-packages.nix" ] && echo " ✅ host-packages.nix (WILL BE PRESERVED)" - - # Check if default.nix is customized - if [ -f "$dir/default.nix" ]; then - if ! cmp -s "$dir/default.nix" "./hosts/default/default.nix" 2>/dev/null; then - echo " ✅ default.nix (CUSTOMIZED - WILL BE PRESERVED)" - echo " 📋 Custom imports detected:" - grep -E "\./|\.\." "$dir/default.nix" | sed 's/^/ /' || echo " (parsing error)" - else - echo " 📋 default.nix (standard template)" - fi - fi - echo "" - fi - done - echo "📊 Total hosts to migrate: $host_count" - echo "" - - # Analyze global packages - echo "📦 GLOBAL PACKAGES ANALYSIS:" - if [ -f "./modules/core/packages.nix" ]; then - # Count total packages - package_count=$(grep -c "^[[:space:]]*[a-zA-Z]" ./modules/core/packages.nix | head -1) - echo "📊 Approximate package count: $package_count" - - # Check for custom additions (commented out packages that user might have enabled) - echo "🔍 Potentially customized packages:" - grep -E "^[[:space:]]*#[a-zA-Z]" ./modules/core/packages.nix | head -10 | sed 's/^/ /' || echo " None detected" - echo "📋 packages.nix status: WILL BE ANALYZED AND PRESERVED IF CUSTOMIZED" - else - echo "❌ modules/core/packages.nix not found" - fi - echo "" - - # Analyze shell customizations - echo "🐚 SHELL CUSTOMIZATIONS ANALYSIS:" - shell_custom_found=false - - # Check zsh customizations - if [ -f "./modules/home/zsh/default.nix" ]; then - if ! cmp -s "./modules/home/zsh/default.nix" "./hosts/default/modules/home/zsh/default.nix" 2>/dev/null; then - echo " ⚠️ modules/home/zsh/default.nix - CUSTOMIZED (REQUIRES MANUAL MERGE)" - shell_custom_found=true - fi - fi - - if [ -f "./modules/home/zsh/zshrc-personal.nix" ]; then - echo " ⚠️ modules/home/zsh/zshrc-personal.nix - PERSONAL FILE (REQUIRES MANUAL MERGE)" - shell_custom_found=true - fi - - # Check bash customizations - if [ -f "./modules/home/bash.nix" ]; then - if ! cmp -s "./modules/home/bash.nix" "./hosts/default/modules/home/bash.nix" 2>/dev/null; then - echo " ⚠️ modules/home/bash.nix - CUSTOMIZED (REQUIRES MANUAL MERGE)" - shell_custom_found=true - fi - fi - - if [ -f "./modules/home/bashrc-personal.nix" ]; then - echo " ⚠️ modules/home/bashrc-personal.nix - PERSONAL FILE (REQUIRES MANUAL MERGE)" - shell_custom_found=true - fi - - # Check eza customizations - if [ -f "./modules/home/eza.nix" ]; then - if ! cmp -s "./modules/home/eza.nix" "./hosts/default/modules/home/eza.nix" 2>/dev/null; then - echo " ⚠️ modules/home/eza.nix - CUSTOMIZED (REQUIRES MANUAL MERGE)" - shell_custom_found=true - fi - fi - - # Check Hyprland customizations - if [ -d "./modules/home/hyprland" ]; then - echo " 🪟 Checking Hyprland configurations..." - hyprland_files=$(find ./modules/home/hyprland -name "*.nix" -type f 2>/dev/null | wc -l) - if [ "$hyprland_files" -gt 0 ]; then - echo " ⚠️ modules/home/hyprland/ - HYPRLAND CONFIGS DETECTED ($hyprland_files files)" - echo " 🚨 CRITICAL: Hyprland configs contain complex settings that CANNOT be auto-migrated" - echo " 📋 Files detected:" - find ./modules/home/hyprland -name "*.nix" -type f | sed 's|^./| |' 2>/dev/null || echo " (error listing files)" - echo " ⚠️ These require careful manual review and migration after upgrade" - echo " 💡 Backup location will contain your current configs for reference" - shell_custom_found=true - fi - fi - - if [ "$shell_custom_found" = false ]; then - echo " ✅ No shell customizations detected" - fi - echo "" - - # Git repository analysis - echo "🔄 GIT REPOSITORY ANALYSIS:" - if [ -d ".git" ]; then - # Current branch and remote - current_branch=$(git branch --show-current 2>/dev/null || echo "unknown") - echo " 📍 Current branch: $current_branch" - - # Remote information - if git remote get-url origin >/dev/null 2>&1; then - remote_url=$(git remote get-url origin 2>/dev/null) - echo " 🌐 Remote origin: $remote_url" - - # Check if it's a fork or custom repo - if [[ "$remote_url" != *"zaney/zaneyos"* ]]; then - echo " ⚠️ CUSTOM REPOSITORY DETECTED!" - echo " This appears to be a fork or custom repository." - echo " Consider running the comparison tool for detailed analysis:" - echo " ./compare-zaneyos-config.sh -r $remote_url -b $current_branch" - fi - fi - - # Check for uncommitted changes - if git diff-index --quiet HEAD -- 2>/dev/null; then - echo " ✅ No uncommitted changes" - else - echo " ⚠️ UNCOMMITTED CHANGES DETECTED!" - echo " You have uncommitted changes that won't be preserved." - echo " Consider committing or stashing them before upgrade." - uncommitted_files=$(git status --porcelain | wc -l) - echo " Number of modified files: $uncommitted_files" - fi - - # Last commit info - if git rev-parse HEAD >/dev/null 2>&1; then - last_commit=$(git log -1 --format="%h - %s (%cr)" 2>/dev/null) - echo " 📝 Last commit: $last_commit" - fi - else - echo " ⚠️ Not a git repository" - echo " Consider initializing git for better version control:" - echo " git init && git add . && git commit -m 'Initial ZaneyOS configuration'" - fi - echo "" - - # Check for other common customization locations - echo "🔍 OTHER CUSTOMIZATIONS ANALYSIS:" - other_custom_found=false - - # Check for custom modules - if [ -d "./modules" ]; then - echo " 📂 Checking modules directory for customizations..." - # Find any .nix files that might be custom - find ./modules -name "*.nix" -type f | while read -r file; do - if [[ "$file" =~ (personal|custom|local) ]]; then - echo " ⚠️ $file - PERSONAL/CUSTOM FILE (REQUIRES MANUAL MERGE)" - other_custom_found=true - fi - done - fi - - # Check for wallpapers - if [ -d "./wallpapers" ]; then - wallpaper_count=$(find ./wallpapers -type f | wc -l) - if [ "$wallpaper_count" -gt 10 ]; then # Assuming default has ~10 wallpapers - echo " 🖼️ Custom wallpapers detected: $wallpaper_count total (WILL BE PRESERVED)" - fi - fi - - if [ "$other_custom_found" = false ]; then - echo " ✅ No other major customizations detected" - fi - echo "" - - # Migration summary - echo "============================================" - echo "📋 MIGRATION SUMMARY:" - echo "============================================" - echo "" - echo "✅ WILL BE AUTOMATICALLY MIGRATED:" - echo " • All host configurations (variables.nix with 2.4 format conversion)" - echo " • Hardware configurations (hardware.nix)" - echo " • Host-specific packages (host-packages.nix)" - echo " • Customized host imports (default.nix if modified)" - echo " • Global packages (modules/core/packages.nix if customized)" - echo " • Wallpapers and themes" - echo "" - echo "⚠️ REQUIRES MANUAL ATTENTION AFTER UPGRADE:" - if [ "$custom_inputs" != " None detected" ]; then - echo " • Custom flake.nix inputs - you'll need to re-add these" - fi - if [ "$shell_custom_found" = true ]; then - echo " • Shell customizations (zsh/bash personal files and modifications)" - fi - if [ "$other_custom_found" = true ]; then - echo " • Custom/personal module files" - fi - # Check for Hyprland configs to add to manual attention list - if [ -d "./modules/home/hyprland" ] && [ "$(find ./modules/home/hyprland -name '*.nix' -type f 2>/dev/null | wc -l)" -gt 0 ]; then - echo " • 🚨 HYPRLAND CONFIGURATIONS - Cannot be auto-migrated, manual review required" - fi - if [ "$custom_inputs" = " None detected" ] && [ "$shell_custom_found" = false ] && [ "$other_custom_found" = false ]; then - echo " • No manual intervention required - standard configuration detected!" - fi - echo "" - echo "📁 BACKUP LOCATION (after upgrade starts):" - echo " ~/.config/zaneyos-backups/zaneyos-2.3-upgrade-backup-$TIMESTAMP/" - echo "" - echo "📝 POST-UPGRADE TODO:" - echo " 1. Reboot system after successful upgrade" - echo " 2. Verify all applications and settings work correctly" - if [ "$custom_inputs" != " None detected" ] || [ "$shell_custom_found" = true ] || [ "$other_custom_found" = true ]; then - echo " 3. Manually merge any flagged customizations from backup" - fi - echo " 4. Review new 2.4 features and packages" - echo "" - echo "============================================" - echo "End of Analysis Report" - echo "============================================" - - } | tee "$analysis_file" - - print_success "Analysis complete! Report saved to: $analysis_file" - echo "" - - # Ask user if they want to continue after seeing the analysis - prompt_yes "Based on this analysis, do you want to proceed with the upgrade? (Y/N):" - if [[ ! $REPLY =~ ^[Yy]$ ]]; then - print_info "Upgrade cancelled by user after analysis review." - print_info "Analysis report is saved for your reference at: $analysis_file" - exit 0 - fi -} - -# Run the pre-check analysis -perform_precheck_analysis - -# Create backup FIRST before making any changes -if ! create_backup; then - print_error "Failed to create backup. Aborting upgrade." - exit 1 -fi - -# Confirm with user before proceeding -echo "" -echo -e "${GREEN}✅ Backup created successfully!${NC}" -echo -e "${YELLOW}📍 Backup location: $BACKUP_DIR${NC}" -echo "" -prompt_yes "Continue with the upgrade to ZaneyOS 2.4? (Y/N):" -if [[ ! $REPLY =~ ^[Yy]$ ]]; then - print_info "Upgrade cancelled by user." - print_info "Your backup is preserved at: $BACKUP_DIR" - exit 0 -fi - -print_header "Fetching ZaneyOS 2.4" - -# Switch to main robustly, handling uncommitted changes and divergent branches -switch_to_main_handling_dirty - -print_header "Discovering Host Configurations" - -# Important: Discover hosts from the BACKUP, not the current working tree -# This ensures we preserve user hosts even if switching branches removed them -print_info "Discovering custom hosts from backup to avoid any branch-change side effects..." -HOST_DIRS=() -if [ -d "$BACKUP_DIR/zaneyos/hosts" ]; then - for dir in "$BACKUP_DIR/zaneyos/hosts"/*/; do - [ -d "$dir" ] || continue - hostname=$(basename "$dir") - if [ "$hostname" != "default" ]; then - HOST_DIRS+=("$hostname") - fi - done -fi - -if [ ${#HOST_DIRS[@]} -eq 0 ]; then - print_error "No custom host configurations found in backup" - print_error "This upgrade script requires at least one custom host configuration" - exit 1 -fi - -print_success "Found ${#HOST_DIRS[@]} host configuration(s): ${HOST_DIRS[*]}" - -print_header "Upgrading Host Configurations" - -# Function to merge variables from 2.3 to 2.4 -merge_variables() { - local hostname=$1 - local old_vars_file="$BACKUP_DIR/zaneyos/hosts/$hostname/variables.nix" - local new_vars_file="./hosts/$hostname/variables.nix" - - print_info "Processing host: $hostname" - - # Create host directory if it doesn't exist - mkdir -p "./hosts/$hostname" - - # Copy the new 2.4 template - cp "./hosts/default/variables.nix" "$new_vars_file" - - # Extract values from old 2.3 configuration - if [ -f "$old_vars_file" ]; then - # Extract key values using more robust parsing - local git_username=$(grep 'gitUsername' "$old_vars_file" | sed 's/.*= *"\([^"]*\)".*/\1/') - local git_email=$(grep 'gitEmail' "$old_vars_file" | sed 's/.*= *"\([^"]*\)".*/\1/') - local browser=$(grep 'browser' "$old_vars_file" | sed 's/.*= *"\([^"]*\)".*/\1/') - local terminal=$(grep 'terminal' "$old_vars_file" | sed 's/.*= *"\([^"]*\)".*/\1/') - local keyboard_layout=$(grep 'keyboardLayout' "$old_vars_file" | sed 's/.*= *"\([^"]*\)".*/\1/') - local console_keymap=$(grep 'consoleKeyMap' "$old_vars_file" | sed 's/.*= *"\([^"]*\)".*/\1/') - local enable_nfs=$(grep 'enableNFS' "$old_vars_file" | sed 's/.*= *\([^;]*\);.*/\1/') - local print_enable=$(grep 'printEnable' "$old_vars_file" | sed 's/.*= *\([^;]*\);.*/\1/') - local thunar_enable=$(grep 'thunarEnable' "$old_vars_file" | sed 's/.*= *\([^;]*\);.*/\1/') - local clock_24h=$(grep 'clock24h' "$old_vars_file" | sed 's/.*= *\([^;]*\);.*/\1/') - - # Extract additional 2.4 variables that might exist in 2.3 - local doom_emacs_enable=$(grep 'doomEmacsEnable' "$old_vars_file" | sed 's/.*= *\([^;]*\);.*/\1/') - local intel_id=$(grep 'intelID' "$old_vars_file" | sed 's/.*= *"\([^"]*\)".*/\1/') - local nvidia_id=$(grep 'nvidiaID' "$old_vars_file" | sed 's/.*= *"\([^"]*\)".*/\1/') - local host_id=$(grep 'hostId' "$old_vars_file" | sed 's/.*= *"\([^"]*\)".*/\1/') - - # Apply the values to new configuration - [ -n "$git_username" ] && sed -i "s/gitUsername = \".*\";/gitUsername = \"$git_username\";/" "$new_vars_file" - [ -n "$git_email" ] && sed -i "s/gitEmail = \".*\";/gitEmail = \"$git_email\";/" "$new_vars_file" - [ -n "$browser" ] && sed -i "s/browser = \".*\";/browser = \"$browser\";/" "$new_vars_file" - [ -n "$terminal" ] && sed -i "s/terminal = \".*\";/terminal = \"$terminal\";/" "$new_vars_file" - [ -n "$keyboard_layout" ] && sed -i "s/keyboardLayout = \".*\";/keyboardLayout = \"$keyboard_layout\";/" "$new_vars_file" - [ -n "$console_keymap" ] && sed -i "s/consoleKeyMap = \".*\";/consoleKeyMap = \"$console_keymap\";/" "$new_vars_file" - [ -n "$enable_nfs" ] && sed -i "s/enableNFS = .*/enableNFS = $enable_nfs;/" "$new_vars_file" - [ -n "$print_enable" ] && sed -i "s/printEnable = .*/printEnable = $print_enable;/" "$new_vars_file" - [ -n "$thunar_enable" ] && sed -i "s/thunarEnable = .*/thunarEnable = $thunar_enable;/" "$new_vars_file" - [ -n "$clock_24h" ] && sed -i "s/clock24h = .*/clock24h = $clock_24h;/" "$new_vars_file" - - # Apply additional 2.4 variables if they existed in 2.3 - [ -n "$doom_emacs_enable" ] && sed -i "s/doomEmacsEnable = .*/doomEmacsEnable = $doom_emacs_enable;/" "$new_vars_file" - [ -n "$intel_id" ] && sed -i "s/intelID = \".*\";/intelID = \"$intel_id\";/" "$new_vars_file" - [ -n "$nvidia_id" ] && sed -i "s/nvidiaID = \".*\";/nvidiaID = \"$nvidia_id\";/" "$new_vars_file" - [ -n "$host_id" ] && sed -i "s/hostId = \".*\";/hostId = \"$host_id\";/" "$new_vars_file" - - # Handle terminal-specific enables - CRITICAL for 2.4 - case "$terminal" in - "alacritty") - sed -i "s/alacrittyEnable = false;/alacrittyEnable = true;/" "$new_vars_file" - print_success "✓ Enabled Alacritty for host $hostname" - ;; - "wezterm") - sed -i "s/weztermEnable = false;/weztermEnable = true;/" "$new_vars_file" - print_success "✓ Enabled WezTerm for host $hostname" - ;; - "ghostty") - sed -i "s/ghosttyEnable = false;/ghosttyEnable = true;/" "$new_vars_file" - print_success "✓ Enabled Ghostty for host $hostname" - ;; - "kitty") - print_info "✓ Kitty is enabled by default" - ;; - *) - print_warning "Unknown terminal '$terminal' - keeping kitty as default" - sed -i "s/terminal = \".*\";/terminal = \"kitty\";/" "$new_vars_file" - ;; - esac - - # Copy stylixImage, waybarChoice, and animChoice if they exist - local stylix_image=$(grep 'stylixImage' "$old_vars_file" | head -1) - if [ -n "$stylix_image" ]; then - # Replace the active stylixImage line - local line_num=$(grep -n 'stylixImage = .*mountainscapedark.jpg;' "$new_vars_file" | cut -d: -f1) - if [ -n "$line_num" ]; then - sed -i "${line_num}s|.*| $stylix_image|" "$new_vars_file" - print_success "✓ Preserved stylixImage setting" - fi - fi - - local waybar_choice=$(grep 'waybarChoice = ' "$old_vars_file" | grep -v '^[[:space:]]*#') - if [ -n "$waybar_choice" ]; then - # Replace the active waybarChoice line - local line_num=$(grep -n 'waybarChoice = .*waybar-curved.nix;' "$new_vars_file" | cut -d: -f1) - if [ -n "$line_num" ]; then - sed -i "${line_num}s|.*| $waybar_choice|" "$new_vars_file" - print_success "✓ Preserved waybarChoice setting" - fi - fi - - local anim_choice=$(grep 'animChoice = ' "$old_vars_file" | grep -v '^[[:space:]]*#') - if [ -n "$anim_choice" ]; then - # Replace the active animChoice line - local line_num=$(grep -n 'animChoice = .*animations-def.nix;' "$new_vars_file" | cut -d: -f1) - if [ -n "$line_num" ]; then - sed -i "${line_num}s|.*| $anim_choice|" "$new_vars_file" - print_success "✓ Preserved animChoice setting" - fi - fi - - # Handle monitor settings - local monitor_start=$(grep -n 'extraMonitorSettings = "' "$old_vars_file" | cut -d: -f1) - if [ -n "$monitor_start" ]; then - local monitor_end=$(tail -n +"$monitor_start" "$old_vars_file" | grep -n '";' | head -1 | cut -d: -f1) - if [ -n "$monitor_end" ]; then - local total_end=$((monitor_start + monitor_end - 1)) - local monitor_settings=$(sed -n "${monitor_start},${total_end}p" "$old_vars_file") - - # Replace the monitor settings in new file - local new_monitor_start=$(grep -n 'extraMonitorSettings = "' "$new_vars_file" | cut -d: -f1) - if [ -n "$new_monitor_start" ]; then - local new_monitor_end=$(tail -n +"$new_monitor_start" "$new_vars_file" | grep -n '";' | head -1 | cut -d: -f1) - if [ -n "$new_monitor_end" ]; then - local new_total_end=$((new_monitor_start + new_monitor_end - 1)) - # Delete old monitor settings and insert new ones - sed -i "${new_monitor_start},${new_total_end}d" "$new_vars_file" - sed -i "$((new_monitor_start - 1))r /dev/stdin" "$new_vars_file" <<< "$monitor_settings" - print_success "✓ Preserved monitor settings" - fi - fi - fi - fi - - # Final safety: remove any duplicate keys that might have slipped in - cleanup_duplicates "$new_vars_file" - - print_success "Configuration merged for host: $hostname" - else - print_warning "No backup found for host: $hostname, using defaults" - fi - - # Also copy hardware.nix if it exists - if [ -f "$BACKUP_DIR/zaneyos/hosts/$hostname/hardware.nix" ]; then - cp "$BACKUP_DIR/zaneyos/hosts/$hostname/hardware.nix" "./hosts/$hostname/" - print_success "✓ Preserved hardware.nix for host: $hostname" - fi - - # Also copy host-packages.nix if it exists (user's custom packages) - if [ -f "$BACKUP_DIR/zaneyos/hosts/$hostname/host-packages.nix" ]; then - cp "$BACKUP_DIR/zaneyos/hosts/$hostname/host-packages.nix" "./hosts/$hostname/" - print_success "✓ Preserved host-packages.nix for host: $hostname" - fi - - # Also copy default.nix if it was customized (compare with template first) - if [ -f "$BACKUP_DIR/zaneyos/hosts/$hostname/default.nix" ]; then - # Check if it's different from the template default.nix - if ! cmp -s "$BACKUP_DIR/zaneyos/hosts/$hostname/default.nix" "./hosts/default/default.nix"; then - cp "$BACKUP_DIR/zaneyos/hosts/$hostname/default.nix" "./hosts/$hostname/" - print_success "✓ Preserved customized default.nix for host: $hostname" - else - print_info "✓ Using template default.nix for host: $hostname (no customizations detected)" - fi - fi -} - -# Process each host -for hostname in "${HOST_DIRS[@]}"; do - merge_variables "$hostname" -done - -print_header "Checking Global Package Customizations" - -# Check if user has customized the global packages.nix file -if [ -f "$BACKUP_DIR/zaneyos/modules/core/packages.nix" ]; then - print_info "Checking for custom packages in global packages.nix..." - - # Compare with new template to see if there are customizations - if ! cmp -s "$BACKUP_DIR/zaneyos/modules/core/packages.nix" "./modules/core/packages.nix"; then - print_warning "Custom packages detected in global packages.nix" - - # Create a backup of the new packages.nix - cp "./modules/core/packages.nix" "./modules/core/packages.nix.template" - - # Copy the user's customized version - cp "$BACKUP_DIR/zaneyos/modules/core/packages.nix" "./modules/core/packages.nix" - - print_success "✓ Preserved custom global packages.nix" - print_info "📋 Note: Your custom packages have been preserved" - print_info "📋 New template available at: modules/core/packages.nix.template" - print_info "📋 You may want to review for new packages to add from the template" - - # Offer to show differences - echo "" - prompt_yes "Would you like to see what packages were added in 2.4? (Y/N):" - if [[ $REPLY =~ ^[Yy]$ ]]; then - print_info "New packages available in ZaneyOS 2.4:" - echo -e "${CYAN}=== Differences between your packages.nix and 2.4 template ===${NC}" - diff -u "./modules/core/packages.nix" "./modules/core/packages.nix.template" || true - echo "" - print_info "You can manually add any new packages you want from the template" - fi - else - print_success "✓ No custom packages detected - using new 2.4 packages.nix" - fi -else - print_warning "No backup found for modules/core/packages.nix - using defaults" -fi - -# Function to detect and update flake.nix with user's actual configuration -update_flake_configuration() { - print_header "Updating Flake Configuration" - - # Detect current username (prefer from old config, fallback to current user) - local detected_username - if [ -n "${HOST_DIRS[0]}" ] && [ -f "$BACKUP_DIR/zaneyos/hosts/${HOST_DIRS[0]}/variables.nix" ]; then - detected_username=$(grep 'gitUsername' "$BACKUP_DIR/zaneyos/hosts/${HOST_DIRS[0]}/variables.nix" | sed 's/.*= *"\([^"]*\)".*/\1/' | head -1) - fi - detected_username=${detected_username:-$(whoami)} - - # Detect current hostname (prefer from system, fallback to first host directory) - local detected_hostname=$(hostname) - if [[ "$detected_hostname" == "nixos" ]] || [[ -z "$detected_hostname" ]]; then - detected_hostname=${HOST_DIRS[0]} - fi - - # Detect GPU profile from hardware or ask user - local detected_profile="vm" # default fallback - print_info "Detecting GPU profile..." - - # Check for NVIDIA - if lspci | grep -i nvidia >/dev/null 2>&1; then - # Check if it's a laptop/mobile GPU - if lspci | grep -i nvidia | grep -i "mobile\|laptop" >/dev/null 2>&1; then - detected_profile="nvidia-laptop" - else - detected_profile="nvidia" - fi - # Check for AMD - elif lspci | grep -i amd | grep -i "VGA\|Display" >/dev/null 2>&1; then - detected_profile="amd" - # Check for Intel - elif lspci | grep -i intel | grep -i "VGA\|Display" >/dev/null 2>&1; then - detected_profile="intel" - # Check if we're in a VM environment - elif systemd-detect-virt >/dev/null 2>&1; then - detected_profile="vm" - print_info "Virtual machine environment detected" - fi - - print_info "Detected configuration:" - print_info " Username: $detected_username" - print_info " Hostname: $detected_hostname" - print_info " GPU Profile: $detected_profile" - - # Confirm with user before updating - echo "" - prompt_yes "Update flake.nix with detected configuration? (Y/N):" - if [[ ! $REPLY =~ ^[Yy]$ ]]; then - print_warning "Skipping flake.nix update - using current values" - return 0 - fi - - # Update flake.nix with detected values - print_info "Updating flake.nix..." - sed -i "s/username = \"[^\"]*\";/username = \"$detected_username\";/" ./flake.nix - sed -i "s/host = \"[^\"]*\";/host = \"$detected_hostname\";/" ./flake.nix - sed -i "s/profile = \"[^\"]*\";/profile = \"$detected_profile\";/" ./flake.nix - - print_success "✓ Updated flake.nix with detected configuration" - - # Show what was updated - print_info "Updated flake.nix contents:" - echo -e "${CYAN}$(grep -A 3 -E 'host =|username =|profile =' ./flake.nix)${NC}" - echo "" -} - -# Update flake.nix with user's actual configuration -update_flake_configuration - -print_header "Building ZaneyOS 2.4" - -print_warning "Using 'boot' option to avoid SDDM display issues" -print_info "This is safer than 'switch' when changing display managers" - -# Get the GPU profile from flake.nix (this determines which nixosConfiguration to use) -# The actual build target is the GPU profile (amd, nvidia, nvidia-laptop, intel, vm) -# not the internal 'profile' variable which is just passed to modules -GPU_PROFILE=$(grep 'profile = ' ./flake.nix | sed 's/.*= *"\([^"]*\)".*/\1/') -print_info "Using GPU profile for build: $GPU_PROFILE" - -# Build the system -echo "" -prompt_yes "Ready to build ZaneyOS 2.4? This may take several minutes. (Y/N):" -if [[ ! $REPLY =~ ^[Yy]$ ]]; then - print_info "Build cancelled. You can run this script again later." - print_info "To revert to 2.3: $0 --revert" - exit 0 -fi - -print_info "Starting build process..." - -BUILD_SUCCESS=false - -if [ "$USE_NH" = true ]; then - print_info "Using NH for build..." - if nh os boot ~/zaneyos --hostname "$GPU_PROFILE"; then - BUILD_SUCCESS=true - fi -else - print_info "Using nixos-rebuild for build..." - if sudo nixos-rebuild boot --flake ~/zaneyos/#"$GPU_PROFILE"; then - BUILD_SUCCESS=true - fi -fi - -print_header "Upgrade Results" - -if [ "$BUILD_SUCCESS" = true ]; then - print_success_banner - - echo "" - echo -e "${CYAN}🔧 Key Changes in ZaneyOS 2.4:${NC}" - echo -e " • SDDM is now the default display manager" - echo -e " • Terminal applications can be individually enabled/disabled" - echo -e " • New application enable/disable toggles available" - echo -e " • Improved configuration structure" - echo "" - - echo -e "${YELLOW}📝 Next Steps:${NC}" - echo -e " 1. Reboot your system to complete the upgrade" - echo -e " 2. SDDM will be your new login screen" - echo -e " 3. Your custom settings have been preserved" - echo -e " 4. Check that all your preferred applications are still available" - echo "" - - echo -e "${CYAN}🔄 Revert Option:${NC}" - echo -e " If you encounter issues, run: $0 --revert" - echo -e " Your 2.3 backup is preserved at: $BACKUP_DIR" - echo "" - - # Prompt for reboot - prompt_yes "Would you like to reboot now? (Y/N):" - if [[ $REPLY =~ ^[Yy]$ ]]; then - print_info "Rebooting in 5 seconds... (Press Ctrl+C to cancel)" - sleep 5 - sudo reboot - else - echo -e "${GREEN}✅ Upgrade complete! Remember to reboot when convenient.${NC}" - fi - -else - print_failure_banner - echo "" - echo -e "${YELLOW}🔄 Recovery Options:${NC}" - echo -e " • Run revert command: $0 --revert" - echo -e " • Your backup is available at: $BACKUP_DIR" - echo -e " • Review the log file: $LOG_FILE" - echo "" - - prompt_yes "Would you like to automatically revert to ZaneyOS 2.3? (Y/N):" - if [[ $REPLY =~ ^[Yy]$ ]]; then - revert_from_backup - else - print_info "Manual revert available with: $0 --revert" - fi - - exit 1 -fi From e7047d901848c77f6c401d70586ace80743034d8 Mon Sep 17 00:00:00 2001 From: Steven Scott Date: Tue, 23 Dec 2025 21:25:32 -0500 Subject: [PATCH 034/232] add sane & local hardware clock options --- modules/core/default.nix | 1 + modules/core/hardware.nix | 13 +------------ modules/core/scanner.nix | 16 ++++++++++++++++ modules/core/user.nix | 1 - modules/options.nix | 6 ++++++ 5 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 modules/core/scanner.nix diff --git a/modules/core/default.nix b/modules/core/default.nix index dc19bc8..9127aed 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -14,6 +14,7 @@ ./printing.nix ./ly.nix ./sddm.nix + ./scanners.nix ./security.nix ./services.nix ./steam.nix diff --git a/modules/core/hardware.nix b/modules/core/hardware.nix index 72e0f18..34db9db 100644 --- a/modules/core/hardware.nix +++ b/modules/core/hardware.nix @@ -1,16 +1,5 @@ -{ - config, - pkgs, - ... -}: let - inherit (config.zaneyos) scannerEnable; -in { +{config, ...}: { hardware = { - sane = { - enable = scannerEnable; - extraBackends = [pkgs.sane-airscan]; - disabledDefaultBackends = ["escl"]; - }; logitech.wireless.enable = false; logitech.wireless.enableGraphical = false; graphics.enable = true; diff --git a/modules/core/scanner.nix b/modules/core/scanner.nix new file mode 100644 index 0000000..e3f7708 --- /dev/null +++ b/modules/core/scanner.nix @@ -0,0 +1,16 @@ +{ + config, + lib, + pkgs, + username, + ... +}: +lib.mkIf config.zaneyos.scannerEnable { + hardware.sane = { + enable = true; + extraBackends = [pkgs.sane-airscan]; + disabledDefaultBackends = ["escl"]; + }; + + users.users.${username}.extraGroups = ["scanner"]; +} diff --git a/modules/core/user.nix b/modules/core/user.nix index 5e440a7..cfd894a 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -36,7 +36,6 @@ in { "libvirtd" #Virt manager/QEMU access "lp" "networkmanager" - "scanner" "wheel" #sudo access "vboxusers" #Virtual Box ]; diff --git a/modules/options.nix b/modules/options.nix index 1abfe14..d9ca2bc 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -34,6 +34,12 @@ with lib; { description = "GPU profile for drivers."; }; + localHardwareClock = mkOption { + type = types.bool; + default = false; + description = "Set hardware clock to local time for better interop with some dual boot or vm setups."; + }; + # Enable/disable bundled applications tmuxEnable = mkOption { type = types.bool; From d7eca397175c38828f7a0844d20e621e878d66ca Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 23 Dec 2025 21:39:56 -0500 Subject: [PATCH 035/232] Updated CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc5c38b..ebf09e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** +#### 📅 **Updated: December 23th, 2025** + +- Added option to disable/enable scanner +- Hardware clock options enhanced + - Thnaks [codingismy11to7](https://github.com/codingismy11to7) + #### 📅 **Updated: December 22th, 2025** - Huge refactor in flake and how variables are handled From f48eeac44c849e5737465cbd1fb755abb6423d47 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 23 Dec 2025 21:47:03 -0500 Subject: [PATCH 036/232] renamed scanner.nix to match scanners.nix in default.nix --- modules/core/{scanner.nix => scanners.nix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename modules/core/{scanner.nix => scanners.nix} (100%) diff --git a/modules/core/scanner.nix b/modules/core/scanners.nix similarity index 100% rename from modules/core/scanner.nix rename to modules/core/scanners.nix From 22c8133ebcd14cd9bf310152f2cc8a00578f2289 Mon Sep 17 00:00:00 2001 From: Steven Scott Date: Wed, 24 Dec 2025 10:35:41 -0500 Subject: [PATCH 037/232] clean up flatpak --- flake.nix | 1 - modules/core/flatpak.nix | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 1f859f8..e06ed18 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,6 @@ modules = [ ./modules/core ./modules/drivers - nix-flatpak.nixosModules.nix-flatpak ./hosts/${host} ./profiles ]; diff --git a/modules/core/flatpak.nix b/modules/core/flatpak.nix index e513739..b328411 100644 --- a/modules/core/flatpak.nix +++ b/modules/core/flatpak.nix @@ -1,9 +1,8 @@ -{pkgs, ...}: { - xdg.portal = { - enable = true; - extraPortals = [pkgs.xdg-desktop-portal-hyprland]; - configPackages = [pkgs.hyprland]; - }; +{inputs, ...}: { + imports = [ + inputs.nix-flatpak.nixosModules.nix-flatpak + ]; + services = { flatpak = { enable = true; @@ -24,7 +23,7 @@ # Add other Flatpak IDs here, e.g., "org.mozilla.firefox" ]; - # Optional: Automatically update Flatpaks when you run nixos-rebuild swit ch + # Optional: Automatically update Flatpaks when you run nixos-rebuild switch update.onActivation = true; }; }; From ae66771fb2deddaf2f5a6a87d7f7351ed2d69d52 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Wed, 24 Dec 2025 11:54:49 -0500 Subject: [PATCH 038/232] Added Caligula TUI for writing ISOs On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: CHANGELOG.md modified: modules/core/packages.nix --- CHANGELOG.md | 7 +++++-- modules/core/packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebf09e7..6409c6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,14 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** -#### 📅 **Updated: December 23th, 2025** +#### 📅 **Updated: December 24th, 2025** -- Added option to disable/enable scanner +- 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** diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 461f120..73059cd 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -51,6 +51,7 @@ in { appimage-run # Needed For AppImage Support brave # Brave Browser brightnessctl # For Screen Brightness Control + caligula # TUI for writing ISOs to flash cliphist # Clipboard manager using rofi menu cmatrix # Matrix Movie Effect In Terminal cowsay # Great Fun Terminal Program @@ -63,7 +64,6 @@ in { ffmpeg # Terminal Video / Audio Editing file-roller # Archive Manager gedit # Simple Graphical Text Editor - gemini-cli # CLI AI client ONLY (optional) gimp # Great Photo Editor gpu-screen-recorder # needed for nnoctalia-shell power-profiles-daemon # needed for noctalia-shell power cycle From 975a419da3e161aa5c207d61c41a5f2867b73c3e Mon Sep 17 00:00:00 2001 From: Don Williams Date: Wed, 24 Dec 2025 20:18:37 -0500 Subject: [PATCH 039/232] Adding opts back to variables.nix --- modules/home/waybar/waybar-mecha.nix | 514 --------------------------- 1 file changed, 514 deletions(-) delete mode 100644 modules/home/waybar/waybar-mecha.nix diff --git a/modules/home/waybar/waybar-mecha.nix b/modules/home/waybar/waybar-mecha.nix deleted file mode 100644 index 81f0ce6..0000000 --- a/modules/home/waybar/waybar-mecha.nix +++ /dev/null @@ -1,514 +0,0 @@ -{ - lib, - pkgs, - config, - ... -}: let - scriptsDir = ./scripts; - scripts = builtins.attrNames (builtins.readDir scriptsDir); -in { - home.file = builtins.listToAttrs (map - (name: { - name = ".config/waybar/scripts/" + name; - value = { - source = "${scriptsDir}/${name}"; - executable = true; - }; - }) - scripts); - - programs.waybar = { - enable = true; - settings = { - mainBar = { - layer = "top"; - position = "top"; - mode = "dock"; - reload_style_on_change = true; - "gtk-layer-shell" = true; - modules-left = [ - "custom/startmenu" - "custom/left1" - "hyprland/workspaces" - "custom/right1" - "custom/paddw" - "hyprland/window" - ]; - modules-center = [ - "custom/paddc" - "custom/left2" - "custom/temperature" - "custom/left3" - "memory" - "custom/left4" - "cpu" - "custom/leftin1" - "custom/left5" - "custom/distro" - "custom/right2" - "custom/rightin1" - "idle_inhibitor" - "custom/weather" - "clock#time" - "custom/right3" - "clock#date" - "custom/right4" - "custom/right5" - ]; - modules-right = [ - "mpris" - "custom/left6" - "pulseaudio" - "custom/left7" - "backlight" - "custom/left8" - "battery" - "custom/leftin2" - "custom/power" - ]; - - "hyprland/workspaces" = { - on-scroll-up = "hyprctl dispatch workspace -1"; - on-scroll-down = "hyprctl dispatch workspace +1"; - persistent-workspaces = { - "1" = []; - "2" = []; - "3" = []; - "4" = []; - "5" = []; - }; - }; - - "hyprland/window" = { - swap-icon-label = false; - format = "{}"; - tooltip = false; - min-length = 5; - rewrite = { - "" = " Hyprland"; - "~" = " Terminal"; - "zsh" = " Terminal"; - "kitty" = " Terminal"; - "tmux(.*)" = " Tmux"; - "(.*)Mozilla Firefox" = "󰈹 Firefox"; - "(.*) �� Mozilla Firefox" = "󰈹 $1"; - "(.*)Zen Browser" = "󰺕 Zen Browser"; - "(.*) — Zen Browser" = "󰺕 $1"; - "(.*) - Visual Studio Code" = "󰨞 $1"; - "(.*)Visual Studio Code" = "󰨞 Visual Studio Code"; - "nvim" = " Neovim"; - "nvim (.*)" = " $1"; - "vim" = " Vim"; - "vim (.*)" = " $1"; - "(.*)Spotify" = " Spotify"; - "(.*)Spotify Premium" = " Spotify Premium"; - "OBS(.*)" = "󰻃 OBS Studio"; - "VLC media player" = "󰕼 VLC Media Player"; - "(.*) - VLC media player" = "󰕼 $1"; - "(.*) - mpv" = " $1"; - "qView" = "󰋩 qView"; - "(.*).jpg" = "󰋩 $1.jpg"; - "(.*).png" = "󰋩 $1.png"; - "(.*).svg" = "󰋩 $1.svg"; - "• Discord(.*)" = "Discord$1"; - "(.*)Discord(.*)" = " $1Discord$2"; - "vesktop" = " Discord"; - "ONLYOFFICE Desktop Editors" = " OnlyOffice Desktop"; - "(.*).docx" = "󰈭 $1.docx"; - "(.*).xlsx" = "󰈜 $1.xlsx"; - "(.*).pptx" = "󰈨 $1.pptx"; - "(.*).pdf" = " $1.pdf"; - "Authenticate" = " Authenticate"; - }; - }; - - "custom/startmenu" = { - format = ""; - tooltip = true; - "tooltip-format" = "App menu"; - # on-click = "rofi -show drun"; - on-click = "launch-nwg-menu"; - "on-click-right" = "nwg-drawer -mr 225 -ml 225 -mt 200 -mb 200 -is 48 --spacing 15"; - }; - - "custom/temperature" = { - exec = "~/.config/waybar/scripts/cpu-temp.sh"; - return-type = "json"; - format = "{}"; - interval = 5; - min-length = 8; - max-length = 8; - }; - - memory = { - states = { - warning = 75; - critical = 90; - }; - format = "󰘚 {percentage}%"; - "format-critical" = "󰀦 {percentage}%"; - tooltip = false; - interval = 5; - min-length = 7; - max-length = 7; - }; - - cpu = { - format = "󰍛 {usage}%"; - tooltip = false; - interval = 5; - min-length = 6; - max-length = 6; - }; - - "custom/distro" = { - format = " "; - tooltip = false; - }; - - idle_inhibitor = { - format = "{icon}"; - format-icons = { - activated = " "; - deactivated = " "; - }; - "tooltip-format-activated" = "Presentation Mode"; - "tooltip-format-deactivated" = "Idle Mode"; - "start-activated" = false; - }; - - "custom/weather" = { - "return-type" = "json"; - exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.local/bin/weather'"; - interval = 600; - tooltip = true; - }; - - "clock#time" = { - format = "{:%H:%M}"; - tooltip = false; - min-length = 6; - max-length = 6; - }; - - "clock#date" = { - format = "󰸗 {:%m-%d}"; - "tooltip-format" = "{calendar}"; - calendar = { - mode = "month"; - "mode-mon-col" = 6; - "on-click-right" = "mode"; - format = { - months = "{}"; - weekdays = "{}"; - today = "{}"; - }; - }; - actions = { - "on-click" = "mode"; - "on-click-right" = "mode"; - }; - min-length = 8; - max-length = 8; - }; - - "custom/wifi" = { - exec = "~/.config/waybar/scripts/wifi-status.sh"; - return-type = "json"; - format = "{}"; - on-click = "~/.config/waybar/scripts/wifi-menu.sh"; - "on-click-right" = "kitty --title '󰤨 Network Manager TUI' bash -c nmtui"; - interval = 1; - min-length = 1; - max-length = 1; - }; - - bluetooth = { - format = "󰂰"; - "format-disabled" = "󰂲"; - "format-connected" = "󰂱"; - "format-connected-battery" = "󰂱"; - "tooltip-format" = "{num_connections} connected"; - "tooltip-format-disabled" = "Bluetooth Disabled"; - "tooltip-format-connected" = "{device_enumerate}"; - "tooltip-format-enumerate-connected" = "{device_alias}"; - "tooltip-format-enumerate-connected-battery" = ":: {device_alias}: 󱊣 {device_battery_percentage}%"; - on-click = "~/.config/waybar/scripts/bluetooth-menu.sh"; - "on-click-right" = "kitty --title '󰂯 Bluetooth TUI' bash -c bluetui"; - interval = 1; - min-length = 1; - max-length = 1; - }; - - mpris = { - format = "{player_icon} {title} - {artist}"; - "format-paused" = "{status_icon} {title} - {artist}"; - "player-icons" = { - default = "󰝚 "; - spotify = "󰓇 "; - firefox = "󰗃 "; - }; - "status-icons" = { - paused = "\u200A\u200A󰏤\u2009\u2009"; - }; - "tooltip-format" = "Playing: {title} - {artist}"; - "tooltip-format-paused" = "Paused: {title} - {artist}"; - min-length = 5; - max-length = 35; - }; - - pulseaudio = { - format = "{icon} {volume}%"; - "format-muted" = "󰝟 {volume}%"; - "format-icons" = { - default = ["󰕿" "󰖀" "󰕾"]; - headphone = "󰋋"; - headset = "󰋋"; - }; - "tooltip-format" = "Device: {desc}"; - on-click = "~/.config/waybar/scripts/volume-control.sh -o m"; - "on-scroll-up" = "~/.config/waybar/scripts/volume-control.sh -o i"; - "on-scroll-down" = "~/.config/waybar/scripts/volume-control.sh -o d"; - min-length = 6; - max-length = 6; - }; - - backlight = { - format = "{icon} {percent}%"; - "format-icons" = ["" "" "" "" "" "" "" "" ""]; - tooltip = false; - "on-scroll-up" = "~/.config/waybar/scripts/brightness-control.sh -o i"; - "on-scroll-down" = "~/.config/waybar/scripts/brightness-control.sh -o d"; - min-length = 6; - max-length = 6; - }; - - battery = { - states = { - warning = 20; - critical = 10; - }; - format = "{icon} {capacity}%"; - "format-icons" = ["󰂎" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"]; - "format-charging" = " {capacity}%"; - "tooltip-format" = "Discharging: {time}"; - "tooltip-format-charging" = "Charging: {time}"; - interval = 1; - min-length = 6; - max-length = 6; - }; - - "custom/power" = { - format = " ⏻ "; - tooltip = true; - "tooltip-format" = "Power menu: Left-click for QS logout, Right-click for rofi power menu"; - "on-click" = "qs-wlogout"; - "on-click-right" = "~/.config/waybar/scripts/power-menu.sh"; - }; - - "custom/paddw" = { - format = " "; - tooltip = false; - }; - - "custom/paddc" = { - format = " "; - tooltip = false; - }; - - "custom/left1" = { - format = ""; - tooltip = false; - }; - "custom/left2" = { - format = ""; - tooltip = false; - }; - "custom/left3" = { - format = ""; - tooltip = false; - }; - "custom/left4" = { - format = ""; - tooltip = false; - }; - "custom/left5" = { - format = ""; - tooltip = false; - }; - "custom/left6" = { - format = ""; - tooltip = false; - }; - "custom/left7" = { - format = ""; - tooltip = false; - }; - "custom/left8" = { - format = ""; - tooltip = false; - }; - - "custom/right1" = { - format = ""; - tooltip = false; - }; - "custom/right2" = { - format = ""; - tooltip = false; - }; - "custom/right3" = { - format = ""; - tooltip = false; - }; - "custom/right4" = { - format = ""; - tooltip = false; - }; - "custom/right5" = { - format = ""; - tooltip = false; - }; - - "custom/leftin1" = { - format = ""; - tooltip = false; - }; - "custom/leftin2" = { - format = ""; - tooltip = false; - }; - - "custom/rightin1" = { - format = ""; - tooltip = false; - }; - }; - }; - style = '' - * { - font-family: "JetBrainsMono Nerd Font"; - font-weight: bold; - font-size: 18px; - } - - window#waybar { - background-color: #${config.lib.stylix.colors.base00}; - transition-property: background-color; - transition-duration: .5s; - } - - #workspaces { - background: #${config.lib.stylix.colors.base01}; - } - - #workspaces button { - padding: 0 5px; - background-color: transparent; - color: #${config.lib.stylix.colors.base05}; - } - - #workspaces button:hover { - background: rgba(0, 0, 0, 0.2); - } - - #workspaces button.focused { - background-color: #${config.lib.stylix.colors.base03}; - box-shadow: inherit; - text-shadow: 0 0 2px rgba(0, 0, 0, 0.6); - } - - #workspaces button.urgent { - background-color: #${config.lib.stylix.colors.base08}; - } - - #mode { - background-color: #${config.lib.stylix.colors.base01}; - border-bottom: 3px solid #${config.lib.stylix.colors.base05}; - } - - #clock, - #battery, - #cpu, - #memory, - #disk, - #temperature, - #backlight, - #network, - #pulseaudio, - #wireplumber, - #custom-media, - #tray, - #mode, - #idle_inhibitor, - #scratchpad, - #mpris { - padding: 0 10px; - color: #${config.lib.stylix.colors.base05}; - background-color: #${config.lib.stylix.colors.base01}; - } - - #window, - #workspaces { - margin: 0 4px; - } - - .modules-left > widget:first-child > #workspaces { - margin-left: 0; - } - - .modules-right > widget:last-child > #workspaces { - margin-right: 0; - } - - #battery.charging, #battery.plugged { - color: #${config.lib.stylix.colors.base0B}; - background-color: #${config.lib.stylix.colors.base01}; - } - - @keyframes blink { - to { - background-color: #${config.lib.stylix.colors.base01}; - color: #${config.lib.stylix.colors.base08}; - } - } - - #battery.critical:not(.charging) { - background-color: #${config.lib.stylix.colors.base08}; - color: #${config.lib.stylix.colors.base01}; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; - } - - label:focus { - background-color: #${config.lib.stylix.colors.base00}; - } - - #pulseaudio.muted { - background-color: #${config.lib.stylix.colors.base01}; - color: #${config.lib.stylix.colors.base04}; - } - - #tray { - background-color: #${config.lib.stylix.colors.base01}; - } - - #tray > .passive { - -gtk-icon-effect: dim; - } - - #tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: #${config.lib.stylix.colors.base09}; - } - - #idle_inhibitor.activated { - background-color: #${config.lib.stylix.colors.base01}; - color: #${config.lib.stylix.colors.base0B}; - } - ''; - }; -} From 8e0aac683736a2339c5ae0f92d4f700491c36bb8 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Wed, 24 Dec 2025 20:18:47 -0500 Subject: [PATCH 040/232] Adding opt files back and hostid I am restoring the other waybar & animations options back to hosts/default/variables.nix hostid is needed per host On branch zos-next Your branch is ahead of 'origin/zos-next' by 1 commit. (use "git push" to publish your local commits) Changes to be committed: modified: hosts/default/variables.nix --- hosts/default/variables.nix | 45 +++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index 563e615..eaf720b 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -67,13 +67,54 @@ _: { # 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-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-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"; }; } From ab4cdf63682bf934b0e01339514e5392c73c3a48 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Wed, 24 Dec 2025 21:23:48 -0500 Subject: [PATCH 041/232] Updated flake On branch main Your branch is up to date with 'origin/main'. Changes to be committed: modified: flake.lock --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 783b1a3..6fb3051 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1765361927, - "narHash": "sha256-tLmcNQktKdMpiQDtULTXSO4lcGvFpup6w+z2aRABbXU=", + "lastModified": 1766394679, + "narHash": "sha256-huyKMNTvsqawI1mHocntSV4UcthHNfg21J9PQ3fByHg=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "c2bf2c9bee379c9a50f532567056cf0befcd82c9", + "rev": "89f5f9da4a42f7af91cd941ed8d1b81e99c5007d", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1765495779, - "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1765859973, - "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=", + "lastModified": 1766553861, + "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=", "owner": "nix-community", "repo": "home-manager", - "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8", + "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1765682243, + "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "type": "github" }, "original": { @@ -436,11 +436,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765937330, - "narHash": "sha256-qRHfURG4wcEw70th8Pn/7xE8ZIJja56l+MP4QUMtQkQ=", + "lastModified": 1766622938, + "narHash": "sha256-Eovt/DOCYjFFBZuYbbG9j5jhklzxdNbUGVYYxh3lG3s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "284facc0aa28fba98bc43506ccdd1fed3b97e2a3", + "rev": "5900a0a8850cbba98e16d5a7a6ed389402dfcf4f", "type": "github" }, "original": { @@ -508,11 +508,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1765796859, - "narHash": "sha256-c2YaJUsLGk3WNqIHIU/Pt1fGjNH02ePsHfD5MJlfEe4=", + "lastModified": 1766455379, + "narHash": "sha256-aajoMAR81hZX4PZho2Hvx8Y95M1MtgQHF/8CwyJquZ4=", "owner": "nix-community", "repo": "nixvim", - "rev": "d8c9d8451d4592dd7de647230f407d4d6370bd8e", + "rev": "35688970083857d26bf6c57934541eb906f96249", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1766324023, - "narHash": "sha256-5nyNV3X2W7AjY9ZJzVlN8Y7uV+S9yIE1TBNb4JFDG/w=", + "lastModified": 1766626087, + "narHash": "sha256-85SoTgGK4/QTcrrH73CW3JWxbARQMeKZO1tIdH2OarI=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "4a666591fad226e2217db715020d0ec384cdd4a3", + "rev": "c689d16dff078bc4efbc66336cb11c36fcdf7734", "type": "github" }, "original": { @@ -600,11 +600,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1765894398, - "narHash": "sha256-vZmKngMAaZ38mUjWeXavagrCE5f4h4s9yIShf2q75I4=", + "lastModified": 1766596669, + "narHash": "sha256-9C72hpMDa99n4MbqZqsBkrBQZe+HEN9lnu7Sme67nmU=", "owner": "notashelf", "repo": "nvf", - "rev": "cd81bbb904571b538397d72a29e4c84b98480ee1", + "rev": "ef1f22efaf4aa37ba9382a7d1807fa8ac9c097fd", "type": "github" }, "original": { @@ -663,11 +663,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765900102, - "narHash": "sha256-Ea1R+dGLu/psLNMgYKoDpVLg9psGq9drKUOOcety1fo=", + "lastModified": 1766603740, + "narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=", "owner": "danth", "repo": "stylix", - "rev": "259af48fe5dc004c11aa2b1339814138517616bf", + "rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0", "type": "github" }, "original": { @@ -841,11 +841,11 @@ ] }, "locked": { - "lastModified": 1765715981, - "narHash": "sha256-rAWVEEbfWZKTaiqBA/ogkeHvbzlkDHZjZPHbjWUnpw8=", + "lastModified": 1766359145, + "narHash": "sha256-/HbtppVEx4kkyNWHE+4yQXwx413qNam4Tix4WiJakog=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "463d3f091ad2b0ba2a4982f4181d22e452b2659d", + "rev": "5a0d4afa5a67a4e6df8116f97e27c10c9d47de6b", "type": "github" }, "original": { From ab1ae81513ec611a3912a83654455562efa2588b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 26 Dec 2025 16:18:09 -0500 Subject: [PATCH 042/232] Added systemd service for noctalia-shell On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/core/default.nix new file: modules/core/noctalia-shell.nix --- modules/core/default.nix | 1 + modules/core/noctalia-shell.nix | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 modules/core/noctalia-shell.nix diff --git a/modules/core/default.nix b/modules/core/default.nix index 9127aed..c9e7b18 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -8,6 +8,7 @@ ./network.nix ./nfs.nix ./nh.nix + ./noctalia-shell.nix ./quickshell.nix ./overlays.nix ./packages.nix diff --git a/modules/core/noctalia-shell.nix b/modules/core/noctalia-shell.nix new file mode 100644 index 0000000..e998ccc --- /dev/null +++ b/modules/core/noctalia-shell.nix @@ -0,0 +1,6 @@ +{config, ...}: let + inherit (config.zaneyos) barChoice; +in { + # Enable the noctalia-shell systemd service only when barChoice == "noctalia" + services.noctalia-shell.enable = barChoice == "noctalia"; +} From 3f4c4d8e21b690c9e838c89d67680cdb334d31eb Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 26 Dec 2025 16:38:39 -0500 Subject: [PATCH 043/232] Removed incorrect module On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/core/default.nix deleted: modules/core/noctalia-shell.nix --- modules/core/default.nix | 1 - modules/core/noctalia-shell.nix | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 modules/core/noctalia-shell.nix diff --git a/modules/core/default.nix b/modules/core/default.nix index c9e7b18..9127aed 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -8,7 +8,6 @@ ./network.nix ./nfs.nix ./nh.nix - ./noctalia-shell.nix ./quickshell.nix ./overlays.nix ./packages.nix diff --git a/modules/core/noctalia-shell.nix b/modules/core/noctalia-shell.nix deleted file mode 100644 index e998ccc..0000000 --- a/modules/core/noctalia-shell.nix +++ /dev/null @@ -1,6 +0,0 @@ -{config, ...}: let - inherit (config.zaneyos) barChoice; -in { - # Enable the noctalia-shell systemd service only when barChoice == "noctalia" - services.noctalia-shell.enable = barChoice == "noctalia"; -} From 3a356dcfca4ea33333d5770d1f23cc62bad948ed Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 26 Dec 2025 16:45:57 -0500 Subject: [PATCH 044/232] Added systemd user service for noctalia On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/noctalia.nix --- modules/home/noctalia.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/home/noctalia.nix b/modules/home/noctalia.nix index 17133a9..fbf6c04 100644 --- a/modules/home/noctalia.nix +++ b/modules/home/noctalia.nix @@ -27,4 +27,27 @@ in { chmod -R u+rwX "$DEST" fi ''; + + # Enable the noctalia-shell systemd user service + systemd.user.services.noctalia-shell = { + Unit = { + Description = "Noctalia Shell - Wayland desktop shell"; + Documentation = "https://docs.noctalia.dev/docs"; + PartOf = ["graphical-session.target"]; + After = ["graphical-session-pre.target"]; + Wants = ["graphical-session-target"]; + }; + Service = { + ExecStart = "${pkgs.quickshell}/bin/quickshell %h/.config/quickshell/noctalia-shell"; + Restart = "always"; + RestartSec = 5; + Environment = [ + "QML_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" + "QML2_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" + ]; + }; + Install = { + WantedBy = ["graphical-session.target"]; + }; + }; } From eab35762586c61efe7f6b33661dc559597149487 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 26 Dec 2025 16:53:41 -0500 Subject: [PATCH 045/232] Fixed pathing to noctalia config files On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/noctalia.nix --- modules/home/noctalia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/noctalia.nix b/modules/home/noctalia.nix index fbf6c04..fbd8dc2 100644 --- a/modules/home/noctalia.nix +++ b/modules/home/noctalia.nix @@ -38,7 +38,7 @@ in { Wants = ["graphical-session-target"]; }; Service = { - ExecStart = "${pkgs.quickshell}/bin/quickshell %h/.config/quickshell/noctalia-shell"; + ExecStart = "${pkgs.quickshell}/bin/quickshell --path %h/.config/quickshell/noctalia-shell"; Restart = "always"; RestartSec = 5; Environment = [ From cdec0772a5d2a10050e621b73f436474ee1a743c Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 26 Dec 2025 18:36:38 -0500 Subject: [PATCH 046/232] Created service for noctalia-shell --- modules/home/noctalia.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/home/noctalia.nix b/modules/home/noctalia.nix index 17133a9..fbd8dc2 100644 --- a/modules/home/noctalia.nix +++ b/modules/home/noctalia.nix @@ -27,4 +27,27 @@ in { chmod -R u+rwX "$DEST" fi ''; + + # Enable the noctalia-shell systemd user service + systemd.user.services.noctalia-shell = { + Unit = { + Description = "Noctalia Shell - Wayland desktop shell"; + Documentation = "https://docs.noctalia.dev/docs"; + PartOf = ["graphical-session.target"]; + After = ["graphical-session-pre.target"]; + Wants = ["graphical-session-target"]; + }; + Service = { + ExecStart = "${pkgs.quickshell}/bin/quickshell --path %h/.config/quickshell/noctalia-shell"; + Restart = "always"; + RestartSec = 5; + Environment = [ + "QML_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" + "QML2_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" + ]; + }; + Install = { + WantedBy = ["graphical-session.target"]; + }; + }; } From b5648bdc83644bc137877a17bc822599c57f17f7 Mon Sep 17 00:00:00 2001 From: Steven Scott Date: Fri, 26 Dec 2025 19:00:05 -0500 Subject: [PATCH 047/232] add support for running on arm64 devices --- flake.nix | 6 +++--- hosts/default/host-packages.nix | 1 - modules/core/boot.nix | 24 ++++++++++++++++++++---- modules/core/packages.nix | 8 +++++--- modules/core/steam.nix | 7 ++++++- modules/home/cli/btop.nix | 21 ++++++++++++++++----- 6 files changed, 50 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index e06ed18..d1c9055 100644 --- a/flake.nix +++ b/flake.nix @@ -47,13 +47,13 @@ alejandra, ... } @ inputs: let - system = "x86_64-linux"; + supportedSystems = ["x86_64-linux" "aarch64-linux"]; + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; username = "dwilliams"; # Deduplicate nixosConfigurations while preserving the top-level 'profile' mkNixosConfig = host: nixpkgs.lib.nixosSystem { - inherit system; specialArgs = { inherit inputs; inherit username; @@ -79,6 +79,6 @@ }) hosts); - formatter.x86_64-linux = inputs.alejandra.packages.x86_64-linux.default; + formatter = forAllSystems (system: inputs.alejandra.packages.${system}.default); }; } diff --git a/hosts/default/host-packages.nix b/hosts/default/host-packages.nix index f44b200..76193ba 100644 --- a/hosts/default/host-packages.nix +++ b/hosts/default/host-packages.nix @@ -1,7 +1,6 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ audacity - discord nodejs ]; } diff --git a/modules/core/boot.nix b/modules/core/boot.nix index 47011ff..9579de8 100644 --- a/modules/core/boot.nix +++ b/modules/core/boot.nix @@ -2,14 +2,30 @@ pkgs, config, ... -}: { +}: let + inherit (pkgs.stdenv.hostPlatform) isx86_64 isAarch64; +in { boot = { - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = + if isx86_64 + then pkgs.linuxPackages_zen + else pkgs.linuxPackages; + kernelModules = ["v4l2loopback"]; extraModulePackages = [config.boot.kernelPackages.v4l2loopback]; kernel.sysctl = {"vm.max_map_count" = 2147483642;}; - loader.systemd-boot.enable = true; - loader.efi.canTouchEfiVariables = true; + + loader = { + grub.enable = false; + systemd-boot.enable = isx86_64; + efi.canTouchEfiVariables = true; + + # this is the bootloader used for raspberry pi 4. + # we will presumably need more fine-grained configuration for what + # bootloader to use. + generic-extlinux-compatible.enable = isAarch64; + }; + # Appimage Support binfmt.registrations.appimage = { wrapInterpreterInShell = false; diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 73059cd..a4a8fc6 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -4,13 +4,17 @@ ... }: let inherit (config.zaneyos) barChoice; + # Noctalia-specific packages + # gpu-screen-recorder requires x86_64 architecture noctaliaPkgs = - if barChoice == "noctalia" + if pkgs.stdenv.hostPlatform.isx86_64 && barChoice == "noctalia" then with pkgs; [ matugen # color palette generator needed for noctalia-shell app2unit # launcher for noctalia-shell + gpu-screen-recorder # needed for noctalia-shell + power-profiles-daemon # needed for noctalia-shell power cycle ] else []; @@ -65,8 +69,6 @@ in { file-roller # Archive Manager gedit # Simple Graphical Text Editor gimp # Great Photo Editor - gpu-screen-recorder # needed for nnoctalia-shell - power-profiles-daemon # needed for noctalia-shell power cycle mesa-demos # needed for inxi diag util tuigreet # The Login Manager (Sometimes Referred To As Display Manager) htop # Simple Terminal Based System Monitor diff --git a/modules/core/steam.nix b/modules/core/steam.nix index 6fafcf7..7ced7eb 100644 --- a/modules/core/steam.nix +++ b/modules/core/steam.nix @@ -1,4 +1,9 @@ -{pkgs, ...}: { +{ + lib, + pkgs, + ... +}: +lib.mkIf pkgs.stdenv.hostPlatform.isx86_64 { programs = { steam = { enable = true; diff --git a/modules/home/cli/btop.nix b/modules/home/cli/btop.nix index 845d758..1e05563 100644 --- a/modules/home/cli/btop.nix +++ b/modules/home/cli/btop.nix @@ -1,10 +1,21 @@ -{pkgs, ...}: { +{ + lib, + osConfig, + pkgs, + ... +}: let + package = + if (!pkgs.stdenv.hostPlatform.isx86_64) + then pkgs.btop + else + pkgs.btop.override { + rocmSupport = true; + cudaSupport = true; + }; +in { programs.btop = { enable = true; - package = pkgs.btop.override { - rocmSupport = true; - cudaSupport = true; - }; + inherit package; settings = { vim_keys = true; rounded_corners = true; From 459ff1afd0befed55daea10c835dde7061fe7c1d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 26 Dec 2025 19:12:26 -0500 Subject: [PATCH 048/232] updated binds for noctalia shell run from systemd On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/hyprland/binds.nix --- modules/home/hyprland/binds.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index c3d8e99..fc28299 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -9,17 +9,17 @@ noctaliaBind = if barChoice == "noctalia" then [ - "$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" - "$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" - "$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory" - "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" - "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" - "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" - "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" - "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" - "$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle" + "$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" + "$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" + "$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggleHistory" + "$modifier,V, Noctalia Clipboard, exec,qs -c noctalia-shell ipc call launcher clipboard" + "$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" + "$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" + "$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier SHIFT,W, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle" + "$modifier,X, Noctalia Power Menu, exec, qs -c noctalia-shell ipc call sessionMenu toggle" + "$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle" + "$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle" ] else []; # Rofi launcher bindings (only included when barChoice != "noctalia") @@ -159,4 +159,3 @@ in { ]; }; } - From f2dfddff6a3a19c47817db7ebb8a822903f25a43 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 26 Dec 2025 20:34:18 -0500 Subject: [PATCH 049/232] Created service for noctalia-shell updated nixvim --- CHANGELOG.md | 157 ++++++++++++++++++++++++++++++ hosts/zaneyos-24-vm/variables.nix | 2 +- modules/home/editors/nixvim.nix | 17 ++-- modules/home/hyprland/binds.nix | 22 ++--- 4 files changed, 178 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46226bd..233f5f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,163 @@ #### 📅 **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 + rn - Rename symbol + 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 + ff - Find files + fm - Find media files + lg - Live grep + fe - File explorer toggle + t - Toggle terminal + . - Toggle comment (line/visual) + z - Zen mode + Z - Zoom + gg - Lazygit + - Terminal (via snacks) + ]t / [t - Next/prev TODO comment + n - Notification history + ``` + +#### 📅 **Updated: December 21st, 2025** + - Updated: - `nixvim.nix` now uses `blink-cmp` for completion/suggestions - This replaces `nvim-cmp` diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix index 34a3ce3..e2d9a2f 100644 --- a/hosts/zaneyos-24-vm/variables.nix +++ b/hosts/zaneyos-24-vm/variables.nix @@ -36,7 +36,7 @@ # Bar/Shell Settings # Choose between noctalia or waybar - barChoice = "waybar"; + barChoice = "noctalia"; # Waybar Settings (used when barChoice = "waybar") clock24h = false; diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 369bca9..d96a717 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -407,17 +407,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 diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 044240a..f6a87ca 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -10,17 +10,17 @@ noctaliaBind = if barChoice == "noctalia" then [ - "$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" - "$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" - "$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory" - "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" - "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" - "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" - "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" - "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" - "$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle" + "$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" + "$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" + "$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggleHistory" + "$modifier,V, Noctalia Clipboard, exec, qs -c noctalia-shell ipc call launcher clipboard" + "$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" + "$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" + "$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier SHIFT,W, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle" + "$modifier,X, Noctalia Power Menu, exec, qs -c noctalia-shell ipc call sessionMenu toggle" + "$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle" + "$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle" ] else []; # Rofi launcher bindings (only included when barChoice != "noctalia") From b1188be2738aa280f23f0b885b2c58ef069ef2b0 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 28 Dec 2025 08:21:00 -0500 Subject: [PATCH 050/232] 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 --- CHANGELOG.md | 4 ++++ flake.nix | 2 +- install-zaneyos.sh | 7 +++++-- modules/drivers/nvidia-amd-hybrid.nix | 15 ++++++++------- .../{amd-hybrid => amd-nvidia-hybrid}/default.nix | 4 ++-- 5 files changed, 20 insertions(+), 12 deletions(-) rename profiles/{amd-hybrid => amd-nvidia-hybrid}/default.nix (89%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 233f5f5..8bfa2e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** +#### 📅 **Updated: December 26th, 2025** + +- Added initial support for AMD, NVIDIA Hybrid laptops + #### 📅 **Updated: December 21st, 2025** - Added user systemd service for `noctalia-shell` diff --git a/flake.nix b/flake.nix index 9e45345..7af3aa5 100644 --- a/flake.nix +++ b/flake.nix @@ -72,7 +72,7 @@ amd = mkNixosConfig "amd"; nvidia = mkNixosConfig "nvidia"; nvidia-laptop = mkNixosConfig "nvidia-laptop"; - amd-hybrid = mkNixosConfig "amd-hybrid"; + amd-nvidia-hybrid = mkNixosConfig "amd-nvidia-hybrid"; intel = mkNixosConfig "intel"; vm = mkNixosConfig "vm"; }; diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 2737ec0..eb90f5d 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -154,8 +154,10 @@ if lspci | grep -qi 'vga\|3d'; then if $has_vm; then DETECTED_PROFILE="vm" + elif $has_nvidia && $has_amd; then + DETECTED_PROFILE="amd-nvidia-hybrid" elif $has_nvidia && $has_intel; then - DETECTED_PROFILE="hybrid" + DETECTED_PROFILE="nvidia-laptop" elif $has_nvidia; then DETECTED_PROFILE="nvidia" elif $has_amd; then @@ -183,9 +185,10 @@ if [ -z "$profile" ]; then read -rp "Enter Your Hardware Profile (GPU) Options: [ amd ] +amd-nvidia-hybrid +intel nvidia nvidia-laptop -intel vm Please type out your choice: " profile if [ -z "$profile" ]; then diff --git a/modules/drivers/nvidia-amd-hybrid.nix b/modules/drivers/nvidia-amd-hybrid.nix index fdaea86..4bc78b6 100644 --- a/modules/drivers/nvidia-amd-hybrid.nix +++ b/modules/drivers/nvidia-amd-hybrid.nix @@ -10,22 +10,23 @@ in { options.drivers.nvidia-amd-hybrid = { enable = mkEnableOption "Enable AMD iGPU + NVIDIA dGPU (Prime offload)"; # AMD iGPU Bus ID (e.g., PCI:5:0:0). Expose as option for future host wiring. - amdgpuBusID = mkOption { + amdgpuBusId = mkOption { type = types.str; default = "PCI:5:0:0"; - description = "PCI Bus ID for AMD iGPU (amdgpuBusId)"; + description = "PCI Bus ID for AMD iGPU"; }; # NVIDIA dGPU Bus ID (e.g., PCI:1:0:0) - nvidiaBusID = mkOption { + nvidiaBusId = mkOption { type = types.str; default = "PCI:1:0:0"; - description = "PCI Bus ID for NVIDIA dGPU (nvidiaBusId)"; + description = "PCI Bus ID for NVIDIA dGPU"; }; }; config = mkIf cfg.enable { # Enforce kernel 6.12 when this hybrid config is selected - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12; + # Not sure this is still neeeded but leaving just in case + # boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12; services.xserver.videoDrivers = ["nvidia"]; @@ -47,8 +48,8 @@ in { }; # Wire from options - amdgpuBusId = cfg.amdgpuBusID; - nvidiaBusId = cfg.nvidiaBusID; + amdgpuBusId = cfg.amdgpuBusId; + nvidiaBusId = cfg.nvidiaBusId; }; }; }; diff --git a/profiles/amd-hybrid/default.nix b/profiles/amd-nvidia-hybrid/default.nix similarity index 89% rename from profiles/amd-hybrid/default.nix rename to profiles/amd-nvidia-hybrid/default.nix index 1e1a133..783bca3 100644 --- a/profiles/amd-hybrid/default.nix +++ b/profiles/amd-nvidia-hybrid/default.nix @@ -10,8 +10,8 @@ in { # Enable AMD+NVIDIA hybrid drivers (Prime offload with AMD as primary) drivers.nvidia-amd-hybrid = { enable = true; - amdgpuBusID = "${amdgpuID}"; - nvidiaBusID = "${nvidiaID}"; + amdgpuBusId = "${amdgpuID}"; + nvidiaBusId = "${nvidiaID}"; }; # Ensure other driver toggles are off for this profile From dd329839b94ea2bfff219b070124fc42ddba3197 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 28 Dec 2025 08:27:54 -0500 Subject: [PATCH 051/232] Added support for amd-nvidia-hybrid Had to rename some varaibles. As there is also an intel-AMD hybrid (I have an old one) So later I will be adding that is also but this amd-nvidia-hybrid is for current HW and amd-hybrid varaible was too generic On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: ../install-zaneyos.sh modified: ../modules/drivers/nvidia-amd-hybrid.nix modified: ../modules/options.nix renamed: amd-hybrid/default.nix -> amd-nvidia-hybrid/default.nix modified: default.nix --- install-zaneyos.sh | 14 +++++++------- modules/drivers/nvidia-amd-hybrid.nix | 15 ++++++++------- modules/options.nix | 2 +- .../{amd-hybrid => amd-nvidia-hybrid}/default.nix | 8 ++++---- profiles/default.nix | 2 +- 5 files changed, 21 insertions(+), 20 deletions(-) rename profiles/{amd-hybrid => amd-nvidia-hybrid}/default.nix (71%) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index dd68e4e..b691faf 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -157,10 +157,10 @@ if lspci | grep -qi 'vga\|3d'; then if $has_vm; then DETECTED_PROFILE="vm" + elif $has_nvidia && $has_amd; then + DETECTED_PROFILE="amd-nvidia-hybrid" elif $has_nvidia && $has_intel; then DETECTED_PROFILE="nvidia-laptop" - elif $has_nvidia && $has_amd; then - DETECTED_PROFILE="amd-hybrid" elif $has_nvidia; then DETECTED_PROFILE="nvidia" elif $has_amd; then @@ -188,11 +188,11 @@ if [ -z "$profile" ]; then read -rp "Enter Your Hardware Profile (GPU) Options: [ amd ] - nvidia - nvidia-laptop - amd-hybrid - intel - vm +amd-nvidia-hybrid +intel +nvidia +nvidia-laptop +vm Please type out your choice: " profile if [ -z "$profile" ]; then profile="amd" diff --git a/modules/drivers/nvidia-amd-hybrid.nix b/modules/drivers/nvidia-amd-hybrid.nix index fdaea86..d6e0083 100644 --- a/modules/drivers/nvidia-amd-hybrid.nix +++ b/modules/drivers/nvidia-amd-hybrid.nix @@ -10,22 +10,23 @@ in { options.drivers.nvidia-amd-hybrid = { enable = mkEnableOption "Enable AMD iGPU + NVIDIA dGPU (Prime offload)"; # AMD iGPU Bus ID (e.g., PCI:5:0:0). Expose as option for future host wiring. - amdgpuBusID = mkOption { + amdgpuBusId = mkOption { type = types.str; default = "PCI:5:0:0"; - description = "PCI Bus ID for AMD iGPU (amdgpuBusId)"; + description = "PCI Bus ID for AMD iGPU"; }; # NVIDIA dGPU Bus ID (e.g., PCI:1:0:0) - nvidiaBusID = mkOption { + nvidiaBusId = mkOption { type = types.str; default = "PCI:1:0:0"; - description = "PCI Bus ID for NVIDIA dGPU (nvidiaBusId)"; + description = "PCI Bus ID for NVIDIA dGPU"; }; }; config = mkIf cfg.enable { # Enforce kernel 6.12 when this hybrid config is selected - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12; + # Not sure this is still needed leaving in just in case + #boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12; services.xserver.videoDrivers = ["nvidia"]; @@ -47,8 +48,8 @@ in { }; # Wire from options - amdgpuBusId = cfg.amdgpuBusID; - nvidiaBusId = cfg.nvidiaBusID; + amdgpuBusId = cfg.amdgpuBusId; + nvidiaBusId = cfg.nvidiaBusId; }; }; }; diff --git a/modules/options.nix b/modules/options.nix index d9ca2bc..00fadb2 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -29,7 +29,7 @@ with lib; { }; gpuProfile = mkOption { - type = types.enum ["amd" "nvidia" "nvidia-laptop" "amd-hybrid" "intel" "vm"]; + type = types.enum ["amd" "nvidia" "nvidia-laptop" "amd-nvidia-hybrid" "intel" "vm"]; example = "nvidia"; description = "GPU profile for drivers."; }; diff --git a/profiles/amd-hybrid/default.nix b/profiles/amd-nvidia-hybrid/default.nix similarity index 71% rename from profiles/amd-hybrid/default.nix rename to profiles/amd-nvidia-hybrid/default.nix index 7da752b..f4386eb 100644 --- a/profiles/amd-hybrid/default.nix +++ b/profiles/amd-nvidia-hybrid/default.nix @@ -3,12 +3,12 @@ lib, ... }: { - config = lib.mkIf (config.zaneyos.gpuProfile == "amd-hybrid") { + config = lib.mkIf (config.zaneyos.gpuProfile == "amd-nvidia-hybrid") { # Enable AMD+NVIDIA hybrid drivers (Prime offload with AMD as primary) drivers.nvidia-amd-hybrid = { enable = true; - amdgpuBusID = config.zaneyos.amdgpuID; - nvidiaBusID = config.zaneyos.nvidiaID; + amdgpuBusId = config.zaneyos.amdgpuID; + nvidiaBusId = config.zaneyos.nvidiaID; }; # Ensure other driver toggles are off for this profile @@ -19,4 +19,4 @@ vm.guest-services.enable = false; }; -} \ No newline at end of file +} diff --git a/profiles/default.nix b/profiles/default.nix index 443bc1c..c34d9d5 100644 --- a/profiles/default.nix +++ b/profiles/default.nix @@ -1,7 +1,7 @@ _: { imports = [ ./amd - ./amd-hybrid + ./amd-nvidia-hybrid ./intel ./nvidia ./nvidia-laptop From 5e815311f8ef985e9c04367d477d74318f8cd261 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 29 Dec 2025 09:31:56 -0500 Subject: [PATCH 052/232] 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 --- CHANGELOG.md | 3 ++- modules/home/hyprland/exec-once.nix | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bfa2e0..ba70538 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,9 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** -#### 📅 **Updated: December 26th, 2025** +#### 📅 **Updated: December 29th, 2025** +- Removed extra `noctalia-shell` startup - Added initial support for AMD, NVIDIA Hybrid laptops #### 📅 **Updated: December 21st, 2025** diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index 3375433..28f31f1 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -13,7 +13,6 @@ "pkill waybar" "killall -q swaync" "pkill swaync" - "noctalia-shell" ] else []; # Waybar-specific startup commands From ed3883a36cb681a5293a4962ca1e37775c9d5a33 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Wed, 31 Dec 2025 01:50:17 -0500 Subject: [PATCH 053/232] Updated flake On branch main Your branch is up to date with 'origin/main'. Changes to be committed: modified: flake.lock --- flake.lock | 57 +++++++++++++++++++++--------------------------------- 1 file changed, 22 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 6fb3051..f9232fe 100644 --- a/flake.lock +++ b/flake.lock @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1766553861, - "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=", + "lastModified": 1767024057, + "narHash": "sha256-B1aycRjMRvb6QOGbnqDhiDzZwMebj5jxZ5qyJzaKvpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e", + "rev": "34578a2fdfce4257ce5f5baf6e7efbd4e4e252b1", "type": "github" }, "original": { @@ -402,7 +402,10 @@ }, "ndg": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nvf", + "nixpkgs" + ] }, "locked": { "lastModified": 1765720983, @@ -436,11 +439,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766622938, - "narHash": "sha256-Eovt/DOCYjFFBZuYbbG9j5jhklzxdNbUGVYYxh3lG3s=", + "lastModified": 1767155843, + "narHash": "sha256-pby+ao19K1KQ/Ug8wL5yCcNydhHmnyaFnJZvW1putpU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5900a0a8850cbba98e16d5a7a6ed389402dfcf4f", + "rev": "129e7faa03027471fe3a92d3bab022434089ab1a", "type": "github" }, "original": { @@ -451,22 +454,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1764081664, "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=", @@ -482,7 +469,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1764522689, "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", @@ -508,11 +495,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1766455379, - "narHash": "sha256-aajoMAR81hZX4PZho2Hvx8Y95M1MtgQHF/8CwyJquZ4=", + "lastModified": 1766849711, + "narHash": "sha256-gtLBwhgjERca1UCzGkFplD5epIVRiNkePHVVtyFr73g=", "owner": "nix-community", "repo": "nixvim", - "rev": "35688970083857d26bf6c57934541eb906f96249", + "rev": "cae79c48e93bd61e478dfc12456bf68b1ce66074", "type": "github" }, "original": { @@ -529,11 +516,11 @@ ] }, "locked": { - "lastModified": 1766626087, - "narHash": "sha256-85SoTgGK4/QTcrrH73CW3JWxbARQMeKZO1tIdH2OarI=", + "lastModified": 1767140690, + "narHash": "sha256-FemE1tu5FgtlfDD9Vwgk7fA3qg1xsOZKNMapZcB+/LE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "c689d16dff078bc4efbc66336cb11c36fcdf7734", + "rev": "a3e277ce20dc3401afb7887c089395b0ad0d3108", "type": "github" }, "original": { @@ -596,15 +583,15 @@ "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems_4" }, "locked": { - "lastModified": 1766596669, - "narHash": "sha256-9C72hpMDa99n4MbqZqsBkrBQZe+HEN9lnu7Sme67nmU=", + "lastModified": 1767123832, + "narHash": "sha256-WI+DaMQLJ/QVUKCNk1gvo8y0Rw6C4uDx8BW1mRVVOMU=", "owner": "notashelf", "repo": "nvf", - "rev": "ef1f22efaf4aa37ba9382a7d1807fa8ac9c097fd", + "rev": "0390abd6736ff34a016afc66366d1f46372f28de", "type": "github" }, "original": { @@ -653,7 +640,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nur": "nur", "systems": "systems_5", "tinted-foot": "tinted-foot", From b5f8d4576ec90c14d15920dc4d9af12c3a80b948 Mon Sep 17 00:00:00 2001 From: Steven Scott Date: Thu, 1 Jan 2026 00:15:27 -0500 Subject: [PATCH 054/232] enable keyboard wake from idle --- modules/home/hyprland/hyprland.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 3417be0..a7dfee2 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -122,7 +122,7 @@ in { layers_hog_keyboard_focus = true; initial_workspace_tracking = 0; mouse_move_enables_dpms = true; - key_press_enables_dpms = false; + key_press_enables_dpms = true; disable_hyprland_logo = true; disable_splash_rendering = true; enable_swallow = false; @@ -200,4 +200,5 @@ in { #layerrule = blur,waybar "; }; -} \ No newline at end of file +} + From 3f13aed7756645f7bc0abec4258aec2694e93519 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 1 Jan 2026 01:07:49 -0500 Subject: [PATCH 055/232] 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 --- modules/home/hyprland/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index ce1027f..79dab33 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -124,7 +124,7 @@ in { layers_hog_keyboard_focus = true; initial_workspace_tracking = 0; mouse_move_enables_dpms = true; - key_press_enables_dpms = false; + key_press_enables_dpms = true; disable_hyprland_logo = true; disable_splash_rendering = true; enable_swallow = false; From 8011d85dc495574c570aade480239ac1c4dbc1ce Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 1 Jan 2026 01:09:01 -0500 Subject: [PATCH 056/232] Updated CHANGELOG on dpms change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba70538..e42f741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - 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** From 38cd7adda6ff50ce01d11d5e6f815fae9230c9a7 Mon Sep 17 00:00:00 2001 From: Steven Scott Date: Sat, 3 Jan 2026 12:37:02 -0500 Subject: [PATCH 057/232] clean up home/default.nix --- modules/home/default.nix | 152 +++++++------------- modules/home/editors/antigravity.nix | 8 +- modules/home/editors/doom-emacs-install.nix | 20 ++- modules/home/editors/doom-emacs.nix | 8 +- modules/home/editors/evil-helix.nix | 148 +++++++++---------- modules/home/editors/vscode.nix | 3 +- modules/home/terminals/alacritty.nix | 5 +- modules/home/terminals/ghostty.nix | 9 +- modules/home/terminals/tmux.nix | 8 +- modules/home/terminals/wezterm.nix | 8 +- 10 files changed, 175 insertions(+), 194 deletions(-) diff --git a/modules/home/default.nix b/modules/home/default.nix index 974acfa..7ba343f 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,17 +1,5 @@ {zaneyos, ...}: let - inherit - (zaneyos) - alacrittyEnable - barChoice - ghosttyEnable - tmuxEnable - waybarChoice - weztermEnable - vscodeEnable - helixEnable - doomEmacsEnable - antigravityEnable - ; + inherit (zaneyos) barChoice waybarChoice; # Select bar module based on barChoice barModule = @@ -19,91 +7,55 @@ then ./noctalia.nix else waybarChoice; in { - imports = - [ - ./amfora.nix - ./bash.nix - ./bashrc-personal.nix - ./overview.nix - ./python.nix - ./cli/bat.nix - ./cli/btop.nix - ./cli/bottom.nix - ./cli/cava.nix - ./emoji.nix - ./eza.nix - ./fastfetch - ./cli/fzf.nix - ./cli/gh.nix - ./cli/git.nix - ./gtk.nix - ./cli/htop.nix - ./hyprland - ./terminals/kitty.nix - ./cli/lazygit.nix - ./obs-studio.nix - #./editors/nvf.nix - ./editors/nixvim.nix - ./editors/nano.nix - ./rofi - ./qt.nix - ./scripts - ./scripts/gemini-cli.nix - ./stylix.nix - ./swappy.nix - ./swaync.nix - ./tealdeer.nix - ./virtmanager.nix - barModule - ./wlogout - ./xdg.nix - ./yazi - ./zen-browser.nix - ./zoxide.nix - ./zsh - ] - ++ ( - 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 [] - ); + 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/nvf.nix + ./editors/nixvim.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 + ]; } - diff --git a/modules/home/editors/antigravity.nix b/modules/home/editors/antigravity.nix index c5dc963..594b1d6 100644 --- a/modules/home/editors/antigravity.nix +++ b/modules/home/editors/antigravity.nix @@ -1,4 +1,10 @@ -{pkgs, ...}: { +{ + lib, + pkgs, + zaneyos, + ... +}: +lib.mkIf zaneyos.antigravityEnable { # Google Antigravity IDE helper, exposed via antigravity-nix overlay as pkgs.google-antigravity home.packages = with pkgs; [ google-antigravity diff --git a/modules/home/editors/doom-emacs-install.nix b/modules/home/editors/doom-emacs-install.nix index cdc48fa..24717c1 100644 --- a/modules/home/editors/doom-emacs-install.nix +++ b/modules/home/editors/doom-emacs-install.nix @@ -1,9 +1,10 @@ -{pkgs, ...}: let - doom-icon = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/jeetelongname/doom-banners/master/splashes/doom/doom-emacs-color2.svg"; - sha256 = "1xxi5ra1z8njsqaqiaq96wyn1sc967l42kvjzbji1zrjj8za6bgq"; - }; -in { +{ + lib, + pkgs, + zaneyos, + ... +}: +lib.mkIf zaneyos.doomEmacsEnable { # 1. Create a script to install Doom Emacs home.packages = [ (pkgs.writeShellScriptBin "get-doom" '' @@ -63,7 +64,12 @@ in { ]; # 3. Create a desktop file - xdg.desktopEntries.doom-emacs = { + xdg.desktopEntries.doom-emacs = let + doom-icon = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/jeetelongname/doom-banners/master/splashes/doom/doom-emacs-color2.svg"; + sha256 = "1xxi5ra1z8njsqaqiaq96wyn1sc967l42kvjzbji1zrjj8za6bgq"; + }; + in { name = "Doom Emacs"; comment = "A configuration framework for GNU Emacs"; exec = "emacs"; diff --git a/modules/home/editors/doom-emacs.nix b/modules/home/editors/doom-emacs.nix index 8559a3f..829ead9 100644 --- a/modules/home/editors/doom-emacs.nix +++ b/modules/home/editors/doom-emacs.nix @@ -1,4 +1,10 @@ -{pkgs, ...}: { +{ + lib, + pkgs, + zaneyos, + ... +}: +lib.mkIf zaneyos.doomEmacsEnable { home.packages = with pkgs; [ emacs-pgtk git diff --git a/modules/home/editors/evil-helix.nix b/modules/home/editors/evil-helix.nix index 67c447c..8b84baf 100644 --- a/modules/home/editors/evil-helix.nix +++ b/modules/home/editors/evil-helix.nix @@ -1,87 +1,81 @@ -{pkgs, ...}: let - enableEvilHelix = true; # Set to true to enable the configuration -in { - home.packages = with pkgs; ( - if enableEvilHelix - then [ - evil-helix - cmake-language-server - jsonnet-language-server - luaformatter - lua-language-server - marksman - taplo - nil - jq-lsp - vscode-langservers-extracted - bash-language-server - awk-language-server - vscode-extensions.llvm-vs-code-extensions.vscode-clangd - clang-tools - docker-compose-language-service - docker-compose - docker-language-server - typescript-language-server - ] - else [] - ); +{ + lib, + pkgs, + zaneyos, + ... +}: +lib.mkIf zaneyos.helixEnable { + home.packages = with pkgs; [ + evil-helix + cmake-language-server + jsonnet-language-server + luaformatter + lua-language-server + marksman + taplo + nil + jq-lsp + vscode-langservers-extracted + bash-language-server + awk-language-server + vscode-extensions.llvm-vs-code-extensions.vscode-clangd + clang-tools + docker-compose-language-service + docker-compose + docker-language-server + typescript-language-server + ]; - home.file.".config/helix/languages.toml".text = - if enableEvilHelix - then '' - [language-server.nil] - command = "nil" + home.file.".config/helix/languages.toml".text = '' + [language-server.nil] + command = "nil" - [language-server.lua] - command = "lua-language-server" + [language-server.lua] + command = "lua-language-server" - [language-server.json] - command = "vscode-json-languageserver" + [language-server.json] + command = "vscode-json-languageserver" - [language-server.markdown] - command = "marksman" - '' - else ""; + [language-server.markdown] + command = "marksman" + ''; - home.file.".config/helix/config.toml".text = - if enableEvilHelix - then '' - theme = "catppuccin_mocha" - #theme = "ao" + home.file.".config/helix/config.toml".text = '' + theme = "catppuccin_mocha" + #theme = "ao" - [editor] - evil = true - end-of-line-diagnostics = "hint" - auto-pairs = true - mouse = true - middle-click-paste = true - shell = ["zsh", "-c"] - line-number = "absolute" - auto-completion = true - path-completion = true - auto-info = true - color-modes = true - popup-border = "all" - clipboard-provider = "wayland" - indent-heuristic = "hybrid" + [editor] + evil = true + end-of-line-diagnostics = "hint" + auto-pairs = true + mouse = true + middle-click-paste = true + shell = ["zsh", "-c"] + line-number = "absolute" + auto-completion = true + path-completion = true + auto-info = true + color-modes = true + popup-border = "all" + clipboard-provider = "wayland" + indent-heuristic = "hybrid" - [editor.statusline] - left = ["mode", "spinner"] - center = ["file-absolute-path", "total-line-numbers", "read-only-indicator", "file-modification-indicator"] - right = ["diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"] - separator = "│" - mode.normal = "NORMAL" - mode.insert = "INSERT" - mode.select = "SELECT" + [editor.statusline] + left = ["mode", "spinner"] + center = ["file-absolute-path", "total-line-numbers", "read-only-indicator", "file-modification-indicator"] + right = ["diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"] + separator = "│" + mode.normal = "NORMAL" + mode.insert = "INSERT" + mode.select = "SELECT" - [editor.lsp] - enable = true - display-messages = true - display-progress-messages = true + [editor.lsp] + enable = true + display-messages = true + display-progress-messages = true - [editor.inline-diagnostics] - cursor-line = "hint" - other-lines = "hint" - '' - else ""; + [editor.inline-diagnostics] + cursor-line = "hint" + other-lines = "hint" + ''; } diff --git a/modules/home/editors/vscode.nix b/modules/home/editors/vscode.nix index 8b2d3dc..62e4eb6 100644 --- a/modules/home/editors/vscode.nix +++ b/modules/home/editors/vscode.nix @@ -1,6 +1,7 @@ { pkgs, lib, + zaneyos, ... }: let inherit (pkgs.lib) attrByPath; @@ -62,7 +63,7 @@ }; in { programs.vscode = { - enable = true; + enable = zaneyos.vscodeEnable; profiles = { default = { extensions = diff --git a/modules/home/terminals/alacritty.nix b/modules/home/terminals/alacritty.nix index ae9466b..2a94959 100644 --- a/modules/home/terminals/alacritty.nix +++ b/modules/home/terminals/alacritty.nix @@ -1,8 +1,9 @@ { - pkgs, lib, + zaneyos, ... -}: { +}: +lib.mkIf zaneyos.alacrittyEnable { programs.alacritty = let font_family = lib.mkDefault "Maple mono NF"; in { diff --git a/modules/home/terminals/ghostty.nix b/modules/home/terminals/ghostty.nix index a46a587..ac46bc8 100644 --- a/modules/home/terminals/ghostty.nix +++ b/modules/home/terminals/ghostty.nix @@ -1,8 +1,11 @@ { - pkgs, config, + lib, + pkgs, + zaneyos, ... -}: let +}: +lib.mkIf zaneyos.ghosttyEnable (let ghostHome = "${config.xdg.configHome}/ghostty"; shaderFile = "${ghostHome}/shaders/shader.glsl"; in { @@ -219,4 +222,4 @@ in { fi '') ]; -} +}) diff --git a/modules/home/terminals/tmux.nix b/modules/home/terminals/tmux.nix index 3081611..4a2158e 100644 --- a/modules/home/terminals/tmux.nix +++ b/modules/home/terminals/tmux.nix @@ -1,5 +1,11 @@ # Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window. -{pkgs, ...}: { +{ + lib, + pkgs, + zaneyos, + ... +}: +lib.mkIf zaneyos.tmuxEnable { programs.tmux = { enable = true; mouse = true; diff --git a/modules/home/terminals/wezterm.nix b/modules/home/terminals/wezterm.nix index ab274ff..e08e029 100644 --- a/modules/home/terminals/wezterm.nix +++ b/modules/home/terminals/wezterm.nix @@ -1,4 +1,10 @@ -{pkgs, ...}: { +{ + lib, + pkgs, + zaneyos, + ... +}: +lib.mkIf zaneyos.weztermEnable { programs.wezterm = { enable = true; package = pkgs.wezterm; From 9f1ebb8a5dddebfa999a9eb9128dcbc1d13b2031 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 3 Jan 2026 15:08:51 -0500 Subject: [PATCH 058/232] Updated flake, added zos-next test host On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: flake.lock modified: flake.nix new file: hosts/zaneyos-next/default.nix new file: hosts/zaneyos-next/hardware.nix new file: hosts/zaneyos-next/host-packages.nix new file: hosts/zaneyos-next/variables.nix --- flake.lock | 93 ++++++++++++---------------- flake.nix | 1 + hosts/zaneyos-next/default.nix | 7 +++ hosts/zaneyos-next/hardware.nix | 41 ++++++++++++ hosts/zaneyos-next/host-packages.nix | 7 +++ hosts/zaneyos-next/variables.nix | 79 +++++++++++++++++++++++ 6 files changed, 175 insertions(+), 53 deletions(-) create mode 100644 hosts/zaneyos-next/default.nix create mode 100644 hosts/zaneyos-next/hardware.nix create mode 100644 hosts/zaneyos-next/host-packages.nix create mode 100644 hosts/zaneyos-next/variables.nix diff --git a/flake.lock b/flake.lock index 4fa75b3..81d25bc 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1765361927, - "narHash": "sha256-tLmcNQktKdMpiQDtULTXSO4lcGvFpup6w+z2aRABbXU=", + "lastModified": 1766394679, + "narHash": "sha256-huyKMNTvsqawI1mHocntSV4UcthHNfg21J9PQ3fByHg=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "c2bf2c9bee379c9a50f532567056cf0befcd82c9", + "rev": "89f5f9da4a42f7af91cd941ed8d1b81e99c5007d", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1765495779, - "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1765859973, - "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=", + "lastModified": 1767280655, + "narHash": "sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM=", "owner": "nix-community", "repo": "home-manager", - "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8", + "rev": "d49d2543f02dbd789ed032188c84570d929223cb", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1765682243, + "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "type": "github" }, "original": { @@ -402,7 +402,10 @@ }, "ndg": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nvf", + "nixpkgs" + ] }, "locked": { "lastModified": 1765720983, @@ -436,11 +439,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765937330, - "narHash": "sha256-qRHfURG4wcEw70th8Pn/7xE8ZIJja56l+MP4QUMtQkQ=", + "lastModified": 1767468763, + "narHash": "sha256-qOeTnNFVF/C1VyfU2c2GII2IWlQtdvG8rst9htwYyNw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "284facc0aa28fba98bc43506ccdd1fed3b97e2a3", + "rev": "8ce5c49be5a241937d2b3f9686d10e8dcc2f0286", "type": "github" }, "original": { @@ -452,11 +455,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -467,22 +470,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1764081664, "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=", @@ -498,7 +485,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1764522689, "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", @@ -524,11 +511,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1765796859, - "narHash": "sha256-c2YaJUsLGk3WNqIHIU/Pt1fGjNH02ePsHfD5MJlfEe4=", + "lastModified": 1767448089, + "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=", "owner": "nix-community", "repo": "nixvim", - "rev": "d8c9d8451d4592dd7de647230f407d4d6370bd8e", + "rev": "983751b66f255bbea1adc185364e9e7b73f82358", "type": "github" }, "original": { @@ -545,11 +532,11 @@ ] }, "locked": { - "lastModified": 1765939407, - "narHash": "sha256-7wlCANcMdIBNsAz0LGF/IBwkjicxCbCN1K2lrwt/MFk=", + "lastModified": 1767469559, + "narHash": "sha256-HwxFASlCUvmswZwYuxJyq6OisLn9StPXQPxHTRHJQhY=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "c74139c51dbdd47b8123c7186a8af613b840f493", + "rev": "bcc20a5640a99b26f295b388bd9bb0e1d10e3f26", "type": "github" }, "original": { @@ -612,15 +599,15 @@ "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems_4" }, "locked": { - "lastModified": 1765894398, - "narHash": "sha256-vZmKngMAaZ38mUjWeXavagrCE5f4h4s9yIShf2q75I4=", + "lastModified": 1767369300, + "narHash": "sha256-QV+tdP2bS+PJBcp4YHhqpMTzcxsxGaS/d6cKMCJ4PnA=", "owner": "notashelf", "repo": "nvf", - "rev": "cd81bbb904571b538397d72a29e4c84b98480ee1", + "rev": "9c75c2a199af39fc95fb203636ce97d070ca3973", "type": "github" }, "original": { @@ -670,7 +657,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nur": "nur", "systems": "systems_5", "tinted-foot": "tinted-foot", @@ -680,11 +667,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765900102, - "narHash": "sha256-Ea1R+dGLu/psLNMgYKoDpVLg9psGq9drKUOOcety1fo=", + "lastModified": 1766603740, + "narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=", "owner": "danth", "repo": "stylix", - "rev": "259af48fe5dc004c11aa2b1339814138517616bf", + "rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0", "type": "github" }, "original": { @@ -858,11 +845,11 @@ ] }, "locked": { - "lastModified": 1765715981, - "narHash": "sha256-rAWVEEbfWZKTaiqBA/ogkeHvbzlkDHZjZPHbjWUnpw8=", + "lastModified": 1766359145, + "narHash": "sha256-/HbtppVEx4kkyNWHE+4yQXwx413qNam4Tix4WiJakog=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "463d3f091ad2b0ba2a4982f4181d22e452b2659d", + "rev": "5a0d4afa5a67a4e6df8116f97e27c10c9d47de6b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d1c9055..d88f14f 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,7 @@ }; hosts = [ + "zaneyos-next" "default" "nixstation" "zaneyos-24-vm" diff --git a/hosts/zaneyos-next/default.nix b/hosts/zaneyos-next/default.nix new file mode 100644 index 0000000..bdd5f44 --- /dev/null +++ b/hosts/zaneyos-next/default.nix @@ -0,0 +1,7 @@ +{...}: { + imports = [ + ./hardware.nix + ./host-packages.nix + ./variables.nix + ]; +} diff --git a/hosts/zaneyos-next/hardware.nix b/hosts/zaneyos-next/hardware.nix new file mode 100644 index 0000000..5b48ee3 --- /dev/null +++ b/hosts/zaneyos-next/hardware.nix @@ -0,0 +1,41 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/52c176b4-8de0-4607-b52f-8ca391f8b469"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/6EA3-CBC7"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; + + fileSystems."/mnt/nas" = { + device = "192.168.40.11:/volume1/DiskStation54TB"; + fsType = "nfs"; + }; + + swapDevices = []; + + security.sudo.wheelNeedsPassword = false; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/hosts/zaneyos-next/host-packages.nix b/hosts/zaneyos-next/host-packages.nix new file mode 100644 index 0000000..f44b200 --- /dev/null +++ b/hosts/zaneyos-next/host-packages.nix @@ -0,0 +1,7 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + audacity + discord + nodejs + ]; +} diff --git a/hosts/zaneyos-next/variables.nix b/hosts/zaneyos-next/variables.nix new file mode 100644 index 0000000..27c3ddc --- /dev/null +++ b/hosts/zaneyos-next/variables.nix @@ -0,0 +1,79 @@ +_: { + # 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; + + # 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 = "brave"; + + # Available Options: + # Kitty, ghostty, wezterm, aalacrity + # Note: kitty, wezterm, alacritty have to be enabled in `variables.nix` + # Setting it here does not enable it. Kitty is installed by default + terminal = "kitty-bg"; # 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; + + # Set Waybar + # Available Options: + waybarChoice = ../../modules/home/waybar/waybar-curved.nix; + + # Set Animation style + # Available options are: + animChoice = ../../modules/home/hyprland/animations-def.nix; + }; +} From 12d2756ee7318512e63b7f0bff52e55c85028210 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 3 Jan 2026 15:16:18 -0500 Subject: [PATCH 059/232] Fix: Noctalia-shell started twice Removed from exec-once It's started as systemctl --user service On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/hyprland/exec-once.nix --- modules/home/hyprland/exec-once.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index 943aebd..d30ed50 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -8,7 +8,6 @@ "pkill waybar" "killall -q swaync" "pkill swaync" - "noctalia-shell" ] else []; # Waybar-specific startup commands @@ -39,4 +38,3 @@ in { ++ noctaliaExec ++ waybarExec; }; } - From 3176cb0dcdf15b1b69858781f6d10306060b2232 Mon Sep 17 00:00:00 2001 From: Steven Scott Date: Sat, 3 Jan 2026 16:35:40 -0500 Subject: [PATCH 060/232] switch to nix-systems --- flake.lock | 171 +++++++---------------------------------------------- flake.nix | 26 ++++---- 2 files changed, 37 insertions(+), 160 deletions(-) diff --git a/flake.lock b/flake.lock index 81d25bc..f0799e6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,5 @@ { "nodes": { - "alejandra": { - "inputs": { - "fenix": "fenix", - "flakeCompat": "flakeCompat", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751513446, - "narHash": "sha256-pnRh5ysSgMSOQxvL82sNJRwD/CiSYWplrGRU2WLoNKQ=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "c68bef57c1db3add865493d9cb741a14618bdc28", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "repo": "alejandra", - "type": "github" - } - }, "antigravity-nix": { "inputs": { "flake-utils": "flake-utils", @@ -111,28 +89,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "alejandra", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1730615655, - "narHash": "sha256-2HBR3zLn57LXKNRtxBb+O+uDqHM4n0pz51rPayMl4cg=", - "owner": "nix-community", - "repo": "fenix", - "rev": "efeb50e2535b17ffd4a135e6e3e5fd60a525180c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -264,22 +220,6 @@ "type": "github" } }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -469,38 +409,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1764081664, - "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -508,7 +416,9 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "systems": "systems_3" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1767448089, @@ -599,8 +509,12 @@ "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_2", - "systems": "systems_4" + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1767369300, @@ -618,7 +532,6 @@ }, "root": { "inputs": { - "alejandra": "alejandra", "antigravity-nix": "antigravity-nix", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", @@ -628,26 +541,10 @@ "noctalia": "noctalia", "nvf": "nvf", "stylix": "stylix", + "systems": "systems_3", "zen-browser": "zen-browser" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1730555913, - "narHash": "sha256-KNHZUlqsEibg3YtfUyOFQSofP8hp1HKoY+laoesBxRM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "f17a5bbfd0969ba2e63a74505a80e55ecb174ed9", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16", @@ -657,9 +554,13 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "nur": "nur", - "systems": "systems_5", + "systems": [ + "systems" + ], "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -713,46 +614,16 @@ }, "systems_3": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, diff --git a/flake.nix b/flake.nix index d88f14f..150381a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,23 @@ description = "ZaneyOS"; inputs = { + systems.url = "github:nix-systems/default-linux"; home-manager = { url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nvf.url = "github:notashelf/nvf"; - stylix.url = "github:danth/stylix/release-25.11"; + nvf = { + url = "github:notashelf/nvf"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.systems.follows = "systems"; + }; + stylix = { + url = "github:danth/stylix/release-25.11"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.systems.follows = "systems"; + }; nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest"; noctalia = { @@ -21,6 +30,7 @@ nixvim = { url = "github:nix-community/nixvim/nixos-25.11"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.systems.follows = "systems"; }; # Google Antigravity (IDE) @@ -33,10 +43,6 @@ url = "github:0xc000022070/zen-browser-flake/beta"; inputs.nixpkgs.follows = "nixpkgs"; }; - alejandra = { - url = "github:kamadorueda/alejandra"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -44,13 +50,13 @@ home-manager, nixvim, nix-flatpak, - alejandra, + systems, ... } @ inputs: let - supportedSystems = ["x86_64-linux" "aarch64-linux"]; - forAllSystems = nixpkgs.lib.genAttrs supportedSystems; username = "dwilliams"; + forAllSystems = nixpkgs.lib.genAttrs (import systems); + # Deduplicate nixosConfigurations while preserving the top-level 'profile' mkNixosConfig = host: nixpkgs.lib.nixosSystem { @@ -80,6 +86,6 @@ }) hosts); - formatter = forAllSystems (system: inputs.alejandra.packages.${system}.default); + formatter = forAllSystems (pkgs: pkgs.alejandra); }; } From 37bfbdb00ebdad5b372dc374e95b8928af5b4dfd Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 3 Jan 2026 16:45:09 -0500 Subject: [PATCH 061/232] Updated flake after change to nix-systems On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index f0799e6..6bb099e 100644 --- a/flake.lock +++ b/flake.lock @@ -379,11 +379,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767468763, - "narHash": "sha256-qOeTnNFVF/C1VyfU2c2GII2IWlQtdvG8rst9htwYyNw=", + "lastModified": 1767475907, + "narHash": "sha256-w10AFfl20h5MSBCsCegD4xtmcgDlQQeoFsOaIFwHOrE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8ce5c49be5a241937d2b3f9686d10e8dcc2f0286", + "rev": "7a0d60a03534a2d14b0805616aa1fd403fccfa55", "type": "github" }, "original": { @@ -442,11 +442,11 @@ ] }, "locked": { - "lastModified": 1767469559, - "narHash": "sha256-HwxFASlCUvmswZwYuxJyq6OisLn9StPXQPxHTRHJQhY=", + "lastModified": 1767472446, + "narHash": "sha256-MUj9BwcRCOh8VGaqvqiODowm+RQlU3BY7f5xfai6t0g=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "bcc20a5640a99b26f295b388bd9bb0e1d10e3f26", + "rev": "9b8a5f10d112bed916dd7222a6054af3e4f302a0", "type": "github" }, "original": { From 0e969230eb256baf0be01b71571d5ebd6c564ada Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 3 Jan 2026 16:51:38 -0500 Subject: [PATCH 062/232] Updated CHANGELOG --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6409c6f..3c16603 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,20 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** +#### 📅 **Updated: January 3rd, 2026** + +- Changed: + - moved to `nix-systems` + - better managemenmt 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: From 44f91c805f570c042fd26c0d0267227e30b47669 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 4 Jan 2026 16:53:26 -0500 Subject: [PATCH 063/232] Fixing alejandra error The issue was that forAllSystems returns a set of system names (strings), not packages. The formatter attribute needs to map each system to its corresponding formatter package. I updated it to use nixpkgs.legacyPackages.${system}.alejandra which correctly references the alejandra package for each system architecture. On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: flake.nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 150381a..43eeafa 100644 --- a/flake.nix +++ b/flake.nix @@ -86,6 +86,6 @@ }) hosts); - formatter = forAllSystems (pkgs: pkgs.alejandra); + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); }; } From 9c0111e5b9e286a8c370689344ebd46a02eb7d6f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 4 Jan 2026 16:59:04 -0500 Subject: [PATCH 064/232] Fixing syntax error in waybar file --- modules/home/waybar/waybar-jwt-catppuccin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/waybar/waybar-jwt-catppuccin.nix b/modules/home/waybar/waybar-jwt-catppuccin.nix index a93d3d9..3db7f3b 100644 --- a/modules/home/waybar/waybar-jwt-catppuccin.nix +++ b/modules/home/waybar/waybar-jwt-catppuccin.nix @@ -154,7 +154,7 @@ in { persistent-workspaces = { "*" = 10; }; - };) + }; # Integrated CAVA visualizer using the inline script above "custom/cava_mviz" = { From 3f9126b8e8d642a1b9766fef896376572742d25f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 4 Jan 2026 17:00:00 -0500 Subject: [PATCH 065/232] fix: remove stray closing paren in waybar-jwt-catppuccin.nix Co-Authored-By: Warp --- modules/home/waybar/waybar-jwt-catppuccin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/waybar/waybar-jwt-catppuccin.nix b/modules/home/waybar/waybar-jwt-catppuccin.nix index a93d3d9..3db7f3b 100644 --- a/modules/home/waybar/waybar-jwt-catppuccin.nix +++ b/modules/home/waybar/waybar-jwt-catppuccin.nix @@ -154,7 +154,7 @@ in { persistent-workspaces = { "*" = 10; }; - };) + }; # Integrated CAVA visualizer using the inline script above "custom/cava_mviz" = { From d207b2481fef8ddbcd0326205e0ff9a63d45b043 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 4 Jan 2026 17:02:23 -0500 Subject: [PATCH 066/232] Revert "fix: remove stray closing paren in waybar-jwt-catppuccin.nix" This reverts commit 3f9126b8e8d642a1b9766fef896376572742d25f. --- modules/home/waybar/waybar-jwt-catppuccin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/waybar/waybar-jwt-catppuccin.nix b/modules/home/waybar/waybar-jwt-catppuccin.nix index 3db7f3b..a93d3d9 100644 --- a/modules/home/waybar/waybar-jwt-catppuccin.nix +++ b/modules/home/waybar/waybar-jwt-catppuccin.nix @@ -154,7 +154,7 @@ in { persistent-workspaces = { "*" = 10; }; - }; + };) # Integrated CAVA visualizer using the inline script above "custom/cava_mviz" = { From 1eaa3e3e36c073ef5511d4309ed5eed5c18d9244 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 4 Jan 2026 17:03:14 -0500 Subject: [PATCH 067/232] Fixing syntax error in waybar file --- modules/home/waybar/waybar-jwt-catppuccin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/waybar/waybar-jwt-catppuccin.nix b/modules/home/waybar/waybar-jwt-catppuccin.nix index a93d3d9..3db7f3b 100644 --- a/modules/home/waybar/waybar-jwt-catppuccin.nix +++ b/modules/home/waybar/waybar-jwt-catppuccin.nix @@ -154,7 +154,7 @@ in { persistent-workspaces = { "*" = 10; }; - };) + }; # Integrated CAVA visualizer using the inline script above "custom/cava_mviz" = { From ecf50e4a1d99f8c13ea4e3c0d9194ff4bc2bef79 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 4 Jan 2026 17:11:54 -0500 Subject: [PATCH 068/232] Ran nix fmt No code changes On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/core/nfs.nix modified: modules/core/printing.nix modified: modules/core/sddm.nix modified: modules/core/stylix.nix modified: modules/core/thunar.nix modified: modules/core/xserver.nix modified: modules/home/cli/git.nix modified: modules/home/hyprland/default.nix modified: modules/home/hyprland/hyprland.nix modified: modules/home/waybar/waybar-curved.nix modified: profiles/amd/default.nix modified: profiles/intel/default.nix modified: profiles/nvidia-laptop/default.nix modified: profiles/nvidia/default.nix --- modules/core/nfs.nix | 1 - modules/core/printing.nix | 2 +- modules/core/sddm.nix | 2 +- modules/core/stylix.nix | 1 - modules/core/thunar.nix | 1 - modules/core/xserver.nix | 1 - modules/home/cli/git.nix | 1 - modules/home/hyprland/default.nix | 1 - modules/home/hyprland/hyprland.nix | 1 - modules/home/waybar/waybar-curved.nix | 2 +- profiles/amd/default.nix | 2 +- profiles/intel/default.nix | 2 +- profiles/nvidia-laptop/default.nix | 2 +- profiles/nvidia/default.nix | 2 +- 14 files changed, 7 insertions(+), 14 deletions(-) diff --git a/modules/core/nfs.nix b/modules/core/nfs.nix index d42f45e..9b3b78c 100644 --- a/modules/core/nfs.nix +++ b/modules/core/nfs.nix @@ -6,4 +6,3 @@ in { nfs.server.enable = enableNFS; }; } - diff --git a/modules/core/printing.nix b/modules/core/printing.nix index 7e89b43..7acf5d2 100644 --- a/modules/core/printing.nix +++ b/modules/core/printing.nix @@ -15,4 +15,4 @@ in { }; ipp-usb.enable = printEnable; }; -} \ No newline at end of file +} diff --git a/modules/core/sddm.nix b/modules/core/sddm.nix index f690811..6cdce8f 100644 --- a/modules/core/sddm.nix +++ b/modules/core/sddm.nix @@ -90,4 +90,4 @@ in { environment.systemPackages = [sddm-astronaut]; }; -} \ No newline at end of file +} diff --git a/modules/core/stylix.nix b/modules/core/stylix.nix index c48870f..4ccff1e 100644 --- a/modules/core/stylix.nix +++ b/modules/core/stylix.nix @@ -56,4 +56,3 @@ in { }; }; } - diff --git a/modules/core/thunar.nix b/modules/core/thunar.nix index ffce58e..0b1aae8 100644 --- a/modules/core/thunar.nix +++ b/modules/core/thunar.nix @@ -18,4 +18,3 @@ in { ffmpegthumbnailer # Need For Video / Image Preview ]; } - diff --git a/modules/core/xserver.nix b/modules/core/xserver.nix index 690eec0..554c966 100644 --- a/modules/core/xserver.nix +++ b/modules/core/xserver.nix @@ -42,4 +42,3 @@ in { }; }; } - diff --git a/modules/home/cli/git.nix b/modules/home/cli/git.nix index c4d0af8..b5e41ee 100644 --- a/modules/home/cli/git.nix +++ b/modules/home/cli/git.nix @@ -33,4 +33,3 @@ in { }; }; } - diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index 6ff3bee..14a53ed 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -13,4 +13,3 @@ in { ./windowrules.nix ]; } - diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index a7dfee2..e0af656 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -201,4 +201,3 @@ in { "; }; } - diff --git a/modules/home/waybar/waybar-curved.nix b/modules/home/waybar/waybar-curved.nix index 8dfb9fc..a7319ea 100644 --- a/modules/home/waybar/waybar-curved.nix +++ b/modules/home/waybar/waybar-curved.nix @@ -274,4 +274,4 @@ in '' ]; }; - } \ No newline at end of file + } diff --git a/profiles/amd/default.nix b/profiles/amd/default.nix index a277a7e..4006b56 100644 --- a/profiles/amd/default.nix +++ b/profiles/amd/default.nix @@ -11,4 +11,4 @@ drivers.intel.enable = false; vm.guest-services.enable = false; }; -} \ No newline at end of file +} diff --git a/profiles/intel/default.nix b/profiles/intel/default.nix index 3e71b09..3ed110e 100644 --- a/profiles/intel/default.nix +++ b/profiles/intel/default.nix @@ -11,4 +11,4 @@ drivers.intel.enable = true; vm.guest-services.enable = false; }; -} \ No newline at end of file +} diff --git a/profiles/nvidia-laptop/default.nix b/profiles/nvidia-laptop/default.nix index 49332ae..45762a8 100644 --- a/profiles/nvidia-laptop/default.nix +++ b/profiles/nvidia-laptop/default.nix @@ -15,4 +15,4 @@ drivers.intel.enable = false; vm.guest-services.enable = false; }; -} \ No newline at end of file +} diff --git a/profiles/nvidia/default.nix b/profiles/nvidia/default.nix index 6a63124..26810f5 100644 --- a/profiles/nvidia/default.nix +++ b/profiles/nvidia/default.nix @@ -11,4 +11,4 @@ drivers.intel.enable = false; vm.guest-services.enable = false; }; -} \ No newline at end of file +} From 6f408c9732537ce90576d94c6eecb8daae63c902 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 5 Jan 2026 07:28:48 -0500 Subject: [PATCH 069/232] Fixed systemd service for noctalia & newline in exec-once.nix --- CHANGELOG.md | 8 ++++++++ modules/home/hyprland/exec-once.nix | 4 +--- modules/home/noctalia.nix | 29 ++++++++++++++++------------- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e42f741..3c03dfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,14 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** +#### 📅 **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 + #### 📅 **Updated: December 29th, 2025** - Removed extra `noctalia-shell` startup diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index 28f31f1..dce24a4 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -33,11 +33,9 @@ in { [ "wl-paste --type text --watch cliphist store" # Saves text "wl-paste --type image --watch cliphist store" # Saves images - "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -" + "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user start hyprpolkitagent" - "pypr &" "qs -c overview" # Start quickshell-overview daemon ] ++ noctaliaExec ++ waybarExec; diff --git a/modules/home/noctalia.nix b/modules/home/noctalia.nix index fbd8dc2..f2ae7af 100644 --- a/modules/home/noctalia.nix +++ b/modules/home/noctalia.nix @@ -1,51 +1,54 @@ { - config, pkgs, inputs, lib, ... }: let system = pkgs.stdenv.hostPlatform.system; - noctaliaPath = inputs.noctalia.packages.${system}.default; - configDir = "${noctaliaPath}/share/noctalia-shell"; + noctaliaPkg = inputs.noctalia.packages.${system}.default; + configDir = "${noctaliaPkg}/share/noctalia-shell"; in { - # Install the Noctalia package for this user (CLI, assets, etc.) + # Install the Noctalia package home.packages = [ - noctaliaPath + noctaliaPkg + pkgs.quickshell # Ensure quickshell is available for the service ]; - # Seed the Noctalia QuickShell shell code into ~/.config/quickshell/noctalia-shell - # once, then leave it writable so the GUI and the user can tweak it. + # Seed the configuration home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter ["writeBoundary"] '' set -eu DEST="$HOME/.config/quickshell/noctalia-shell" SRC="${configDir}" if [ ! -d "$DEST" ]; then - mkdir -p "$HOME/.config/quickshell" - cp -R "$SRC" "$DEST" - chmod -R u+rwX "$DEST" + $DRY_RUN_CMD mkdir -p "$HOME/.config/quickshell" + $DRY_RUN_CMD cp -R "$SRC" "$DEST" + $DRY_RUN_CMD chmod -R u+rwX "$DEST" fi ''; - # Enable the noctalia-shell systemd user service + # Systemd User Service systemd.user.services.noctalia-shell = { Unit = { Description = "Noctalia Shell - Wayland desktop shell"; - Documentation = "https://docs.noctalia.dev/docs"; + Documentation = ["https://docs.noctalia.dev/docs"]; PartOf = ["graphical-session.target"]; After = ["graphical-session-pre.target"]; - Wants = ["graphical-session-target"]; + Wants = ["graphical-session.target"]; }; + Service = { + # %h is the home directory specifier for systemd ExecStart = "${pkgs.quickshell}/bin/quickshell --path %h/.config/quickshell/noctalia-shell"; Restart = "always"; RestartSec = 5; + # Combined QML paths for Qt6 Environment = [ "QML_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" "QML2_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" ]; }; + Install = { WantedBy = ["graphical-session.target"]; }; From 9c528312b875bd564d6ea1849ebbc7c37adc1fc2 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 5 Jan 2026 07:31:54 -0500 Subject: [PATCH 070/232] Fixed typo and errors in noctalia.nix systemd Also removed pypr from exec-once Removed extra newline in dbus activation line On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/hyprland/exec-once.nix modified: modules/home/noctalia.nix --- modules/home/hyprland/exec-once.nix | 4 +--- modules/home/noctalia.nix | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index d30ed50..ced98a1 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -28,11 +28,9 @@ in { [ "wl-paste --type text --watch cliphist store" # Saves text "wl-paste --type image --watch cliphist store" # Saves images - "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -" + "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user start hyprpolkitagent" - "pypr &" "qs -c overview" # Start quickshell-overview daemon ] ++ noctaliaExec ++ waybarExec; diff --git a/modules/home/noctalia.nix b/modules/home/noctalia.nix index fbd8dc2..f2ae7af 100644 --- a/modules/home/noctalia.nix +++ b/modules/home/noctalia.nix @@ -1,51 +1,54 @@ { - config, pkgs, inputs, lib, ... }: let system = pkgs.stdenv.hostPlatform.system; - noctaliaPath = inputs.noctalia.packages.${system}.default; - configDir = "${noctaliaPath}/share/noctalia-shell"; + noctaliaPkg = inputs.noctalia.packages.${system}.default; + configDir = "${noctaliaPkg}/share/noctalia-shell"; in { - # Install the Noctalia package for this user (CLI, assets, etc.) + # Install the Noctalia package home.packages = [ - noctaliaPath + noctaliaPkg + pkgs.quickshell # Ensure quickshell is available for the service ]; - # Seed the Noctalia QuickShell shell code into ~/.config/quickshell/noctalia-shell - # once, then leave it writable so the GUI and the user can tweak it. + # Seed the configuration home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter ["writeBoundary"] '' set -eu DEST="$HOME/.config/quickshell/noctalia-shell" SRC="${configDir}" if [ ! -d "$DEST" ]; then - mkdir -p "$HOME/.config/quickshell" - cp -R "$SRC" "$DEST" - chmod -R u+rwX "$DEST" + $DRY_RUN_CMD mkdir -p "$HOME/.config/quickshell" + $DRY_RUN_CMD cp -R "$SRC" "$DEST" + $DRY_RUN_CMD chmod -R u+rwX "$DEST" fi ''; - # Enable the noctalia-shell systemd user service + # Systemd User Service systemd.user.services.noctalia-shell = { Unit = { Description = "Noctalia Shell - Wayland desktop shell"; - Documentation = "https://docs.noctalia.dev/docs"; + Documentation = ["https://docs.noctalia.dev/docs"]; PartOf = ["graphical-session.target"]; After = ["graphical-session-pre.target"]; - Wants = ["graphical-session-target"]; + Wants = ["graphical-session.target"]; }; + Service = { + # %h is the home directory specifier for systemd ExecStart = "${pkgs.quickshell}/bin/quickshell --path %h/.config/quickshell/noctalia-shell"; Restart = "always"; RestartSec = 5; + # Combined QML paths for Qt6 Environment = [ "QML_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" "QML2_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" ]; }; + Install = { WantedBy = ["graphical-session.target"]; }; From d26b8450fae2dcafca1a4c9d854cb4e127eea02b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 5 Jan 2026 16:55:39 -0500 Subject: [PATCH 071/232] 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 --- CHANGELOG.md | 5 ++++- modules/core/system.nix | 2 +- modules/home/hyprland/binds.nix | 22 +++++++++--------- modules/home/hyprland/exec-once.nix | 1 + modules/home/noctalia.nix | 35 +++++------------------------ 5 files changed, 22 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c03dfb..c661926 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ --- -# 🚀 **Current Release - ZaneyOS v2.5.6** +# 🚀 **Current Release - ZaneyOS v2.5.7** #### 📅 **Updated: January 5th, 2026** @@ -14,6 +14,9 @@ - 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** diff --git a/modules/core/system.nix b/modules/core/system.nix index d89981e..1b549c3 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -29,7 +29,7 @@ in { }; environment.variables = { NIXOS_OZONE_WL = "1"; - ZANEYOS_VERSION = "2.5.6"; + ZANEYOS_VERSION = "2.5.7"; ZANEYOS = "true"; }; console.keyMap = "${consoleKeyMap}"; diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index f6a87ca..2557548 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -10,17 +10,17 @@ noctaliaBind = if barChoice == "noctalia" then [ - "$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" - "$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" - "$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggleHistory" - "$modifier,V, Noctalia Clipboard, exec, qs -c noctalia-shell ipc call launcher clipboard" - "$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" - "$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" - "$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend" - "$modifier SHIFT,W, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle" - "$modifier,X, Noctalia Power Menu, exec, qs -c noctalia-shell ipc call sessionMenu toggle" - "$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle" - "$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle" + "$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" + "$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" + "$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory" + "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" + "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" + "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" + "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" + "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" + "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" + "$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle" ] else []; # Rofi launcher bindings (only included when barChoice != "noctalia") diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index dce24a4..c7312c1 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -25,6 +25,7 @@ "nm-applet --indicator" # Delayed-only restore so Stylix finishes first, then user's wallpaper wins with a single change "sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend swww) >/dev/null 2>&1 || true'" + "noctalia-shell &" ] else []; in { diff --git a/modules/home/noctalia.nix b/modules/home/noctalia.nix index f2ae7af..fb25c11 100644 --- a/modules/home/noctalia.nix +++ b/modules/home/noctalia.nix @@ -3,11 +3,13 @@ inputs, lib, ... -}: let +}: +let system = pkgs.stdenv.hostPlatform.system; noctaliaPkg = inputs.noctalia.packages.${system}.default; configDir = "${noctaliaPkg}/share/noctalia-shell"; -in { +in +{ # Install the Noctalia package home.packages = [ noctaliaPkg @@ -15,7 +17,7 @@ in { ]; # Seed the configuration - home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter ["writeBoundary"] '' + home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter [ "writeBoundary" ] '' set -eu DEST="$HOME/.config/quickshell/noctalia-shell" SRC="${configDir}" @@ -26,31 +28,4 @@ in { $DRY_RUN_CMD chmod -R u+rwX "$DEST" fi ''; - - # Systemd User Service - systemd.user.services.noctalia-shell = { - Unit = { - Description = "Noctalia Shell - Wayland desktop shell"; - Documentation = ["https://docs.noctalia.dev/docs"]; - PartOf = ["graphical-session.target"]; - After = ["graphical-session-pre.target"]; - Wants = ["graphical-session.target"]; - }; - - Service = { - # %h is the home directory specifier for systemd - ExecStart = "${pkgs.quickshell}/bin/quickshell --path %h/.config/quickshell/noctalia-shell"; - Restart = "always"; - RestartSec = 5; - # Combined QML paths for Qt6 - Environment = [ - "QML_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" - "QML2_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" - ]; - }; - - Install = { - WantedBy = ["graphical-session.target"]; - }; - }; } From 0c443c1efb925a38d82a430d4f28cc4f9ccedc18 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 5 Jan 2026 17:01:11 -0500 Subject: [PATCH 072/232] 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 --- CHANGELOG.md | 2 +- FAQ.es.md | 8 ++++---- FAQ.md | 14 +++++++------- modules/core/system.nix | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c661926..9479792 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ --- -# 🚀 **Current Release - ZaneyOS v2.5.7** +# 🚀 **Current Release - ZaneyOS v2.5.9** #### 📅 **Updated: January 5th, 2026** diff --git a/FAQ.es.md b/FAQ.es.md index b709bad..5f8fe26 100644 --- a/FAQ.es.md +++ b/FAQ.es.md @@ -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 @@ -387,9 +387,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 diff --git a/FAQ.md b/FAQ.md index ab6e9f3..3988d6a 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1,6 +1,6 @@ [English](FAQ.md) | [Español](FAQ.es.md) -# 💬 ZaneyOS FAQ for v2.5.6 +# 💬 ZaneyOS FAQ - **Date:** 14-Decemnber-2025 @@ -375,9 +375,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 @@ -1570,9 +1570,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 diff --git a/modules/core/system.nix b/modules/core/system.nix index 1b549c3..81d26b6 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -29,7 +29,7 @@ in { }; environment.variables = { NIXOS_OZONE_WL = "1"; - ZANEYOS_VERSION = "2.5.7"; + ZANEYOS_VERSION = "2.5.9"; ZANEYOS = "true"; }; console.keyMap = "${consoleKeyMap}"; From 49f7fb1819ed7fad7f173a4b2502d9c8cc29d377 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Mon, 5 Jan 2026 17:09:53 -0500 Subject: [PATCH 073/232] 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 --- flake.lock | 36 ++++++++++++++--------------- modules/home/hyprland/exec-once.nix | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index f9232fe..3c4e279 100644 --- a/flake.lock +++ b/flake.lock @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1767024057, - "narHash": "sha256-B1aycRjMRvb6QOGbnqDhiDzZwMebj5jxZ5qyJzaKvpI=", + "lastModified": 1767619900, + "narHash": "sha256-KpoCBPvwHz3gAQtIUkohE2InRBFK3r0/FM6z5SPWfvM=", "owner": "nix-community", "repo": "home-manager", - "rev": "34578a2fdfce4257ce5f5baf6e7efbd4e4e252b1", + "rev": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2", "type": "github" }, "original": { @@ -439,11 +439,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767155843, - "narHash": "sha256-pby+ao19K1KQ/Ug8wL5yCcNydhHmnyaFnJZvW1putpU=", + "lastModified": 1767650156, + "narHash": "sha256-06k7q5aOvXrRJJOeOgiMBmAQ+OBXgpAPSO+Lfk708A4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "129e7faa03027471fe3a92d3bab022434089ab1a", + "rev": "6d342ddee265ebe66dd7ee15d0e1c4cea32f92bf", "type": "github" }, "original": { @@ -455,11 +455,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764081664, - "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -495,11 +495,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1766849711, - "narHash": "sha256-gtLBwhgjERca1UCzGkFplD5epIVRiNkePHVVtyFr73g=", + "lastModified": 1767448089, + "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=", "owner": "nix-community", "repo": "nixvim", - "rev": "cae79c48e93bd61e478dfc12456bf68b1ce66074", + "rev": "983751b66f255bbea1adc185364e9e7b73f82358", "type": "github" }, "original": { @@ -516,11 +516,11 @@ ] }, "locked": { - "lastModified": 1767140690, - "narHash": "sha256-FemE1tu5FgtlfDD9Vwgk7fA3qg1xsOZKNMapZcB+/LE=", + "lastModified": 1767648158, + "narHash": "sha256-HMpRFrXqtygK0Dvugi1ZNbUcUMLyFiO46M5XHzwsSsA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a3e277ce20dc3401afb7887c089395b0ad0d3108", + "rev": "9882b056edfc8a4dad79dc701b87e48036e48f5f", "type": "github" }, "original": { @@ -587,11 +587,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1767123832, - "narHash": "sha256-WI+DaMQLJ/QVUKCNk1gvo8y0Rw6C4uDx8BW1mRVVOMU=", + "lastModified": 1767629251, + "narHash": "sha256-qiPFYDicHq4/ji0/9QxVM8hhjspsJrYcMR/S3zKlfjQ=", "owner": "notashelf", "repo": "nvf", - "rev": "0390abd6736ff34a016afc66366d1f46372f28de", + "rev": "e0f6fe7a2ab340acde8ca0a6e4b081beafd3fb5b", "type": "github" }, "original": { diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index c7312c1..50c893b 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -25,7 +25,6 @@ "nm-applet --indicator" # Delayed-only restore so Stylix finishes first, then user's wallpaper wins with a single change "sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend swww) >/dev/null 2>&1 || true'" - "noctalia-shell &" ] else []; in { @@ -38,6 +37,7 @@ in { "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user start hyprpolkitagent" "qs -c overview" # Start quickshell-overview daemon + "noctalia-shell &" ] ++ noctaliaExec ++ waybarExec; }; From 8ab6f8d44467b6fddf668ee0b840d9b68bfe5aea Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 5 Jan 2026 17:47:48 -0500 Subject: [PATCH 074/232] 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 --- modules/home/hyprland/exec-once.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index 50c893b..71cdad4 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -13,6 +13,7 @@ "pkill waybar" "killall -q swaync" "pkill swaync" + "noctalia-shell &" ] else []; # Waybar-specific startup commands From e9272827a8f89c7f574487fc5140b817f5bb14f0 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 5 Jan 2026 17:49:02 -0500 Subject: [PATCH 075/232] Removed dup entry --- modules/home/hyprland/exec-once.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index 71cdad4..adec6b2 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -38,7 +38,6 @@ in { "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user start hyprpolkitagent" "qs -c overview" # Start quickshell-overview daemon - "noctalia-shell &" ] ++ noctaliaExec ++ waybarExec; }; From f1a74345ac65e5389435b7f5cdde320a8ab07055 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 6 Jan 2026 01:26:52 -0500 Subject: [PATCH 076/232] Disabled noctalia service, old revison loads Updted the bindings and startup Matches main branch On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/hyprland/binds.nix modified: modules/home/hyprland/exec-once.nix modified: modules/home/noctalia.nix --- modules/home/hyprland/binds.nix | 22 +++++++++--------- modules/home/hyprland/exec-once.nix | 1 + modules/home/noctalia.nix | 35 +++++------------------------ 3 files changed, 17 insertions(+), 41 deletions(-) diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index fc28299..682bd00 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -9,17 +9,17 @@ noctaliaBind = if barChoice == "noctalia" then [ - "$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" - "$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" - "$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggleHistory" - "$modifier,V, Noctalia Clipboard, exec,qs -c noctalia-shell ipc call launcher clipboard" - "$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" - "$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" - "$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend" - "$modifier SHIFT,W, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle" - "$modifier,X, Noctalia Power Menu, exec, qs -c noctalia-shell ipc call sessionMenu toggle" - "$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle" - "$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle" + "$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" + "$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" + "$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory" + "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" + "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" + "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" + "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" + "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" + "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" + "$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle" ] else []; # Rofi launcher bindings (only included when barChoice != "noctalia") diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index ced98a1..3bd41b1 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -8,6 +8,7 @@ "pkill waybar" "killall -q swaync" "pkill swaync" + "noctalia-shell &" ] else []; # Waybar-specific startup commands diff --git a/modules/home/noctalia.nix b/modules/home/noctalia.nix index f2ae7af..fb25c11 100644 --- a/modules/home/noctalia.nix +++ b/modules/home/noctalia.nix @@ -3,11 +3,13 @@ inputs, lib, ... -}: let +}: +let system = pkgs.stdenv.hostPlatform.system; noctaliaPkg = inputs.noctalia.packages.${system}.default; configDir = "${noctaliaPkg}/share/noctalia-shell"; -in { +in +{ # Install the Noctalia package home.packages = [ noctaliaPkg @@ -15,7 +17,7 @@ in { ]; # Seed the configuration - home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter ["writeBoundary"] '' + home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter [ "writeBoundary" ] '' set -eu DEST="$HOME/.config/quickshell/noctalia-shell" SRC="${configDir}" @@ -26,31 +28,4 @@ in { $DRY_RUN_CMD chmod -R u+rwX "$DEST" fi ''; - - # Systemd User Service - systemd.user.services.noctalia-shell = { - Unit = { - Description = "Noctalia Shell - Wayland desktop shell"; - Documentation = ["https://docs.noctalia.dev/docs"]; - PartOf = ["graphical-session.target"]; - After = ["graphical-session-pre.target"]; - Wants = ["graphical-session.target"]; - }; - - Service = { - # %h is the home directory specifier for systemd - ExecStart = "${pkgs.quickshell}/bin/quickshell --path %h/.config/quickshell/noctalia-shell"; - Restart = "always"; - RestartSec = 5; - # Combined QML paths for Qt6 - Environment = [ - "QML_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" - "QML2_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" - ]; - }; - - Install = { - WantedBy = ["graphical-session.target"]; - }; - }; } From 80f8bfb41a3c52b4ff5c3686d02af7d04ade1418 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Wed, 7 Jan 2026 20:48:58 -0500 Subject: [PATCH 077/232] Updated flake On branch main Your branch is up to date with 'origin/main'. Changes to be committed: modified: flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 3c4e279..646eb64 100644 --- a/flake.lock +++ b/flake.lock @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1767619900, - "narHash": "sha256-KpoCBPvwHz3gAQtIUkohE2InRBFK3r0/FM6z5SPWfvM=", + "lastModified": 1767780135, + "narHash": "sha256-5SbmsLMgxzPd9YMbFR4IHfOXv6bjWs+dfl6IbSq3r7s=", "owner": "nix-community", "repo": "home-manager", - "rev": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2", + "rev": "c08430923ed417abc653884328a39e98496cfd0f", "type": "github" }, "original": { @@ -439,11 +439,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767650156, - "narHash": "sha256-06k7q5aOvXrRJJOeOgiMBmAQ+OBXgpAPSO+Lfk708A4=", + "lastModified": 1767825194, + "narHash": "sha256-7/I9heGsLJ+pFv57aiu0Y7Cux39oL1HiZoGUNhzjvvs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6d342ddee265ebe66dd7ee15d0e1c4cea32f92bf", + "rev": "4e97aaa1b4aa67df028dd8d116d08ba25bbcb7fb", "type": "github" }, "original": { @@ -516,11 +516,11 @@ ] }, "locked": { - "lastModified": 1767648158, - "narHash": "sha256-HMpRFrXqtygK0Dvugi1ZNbUcUMLyFiO46M5XHzwsSsA=", + "lastModified": 1767836672, + "narHash": "sha256-n1fh/QF2H6pb5HV4+ANL5cguSypv9SFMiZvc1p4ZvYA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9882b056edfc8a4dad79dc701b87e48036e48f5f", + "rev": "0b2365c909346ebfe7d19d0c3214e2fd340c4c02", "type": "github" }, "original": { @@ -587,11 +587,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1767629251, - "narHash": "sha256-qiPFYDicHq4/ji0/9QxVM8hhjspsJrYcMR/S3zKlfjQ=", + "lastModified": 1767766515, + "narHash": "sha256-Hr87qJDIi4rL/d0njZYPyKDjtom6lDF3AV2UZL+K/fk=", "owner": "notashelf", "repo": "nvf", - "rev": "e0f6fe7a2ab340acde8ca0a6e4b081beafd3fb5b", + "rev": "ceaae0eb2ece9e06159d6de80b0709e38d77f6a4", "type": "github" }, "original": { From 8694b9552f9a412ec7ba0ecea2a9fcf6b468e609 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Wed, 7 Jan 2026 20:56:45 -0500 Subject: [PATCH 078/232] Updated flake --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 6bb099e..018ebb2 100644 --- a/flake.lock +++ b/flake.lock @@ -262,11 +262,11 @@ ] }, "locked": { - "lastModified": 1767280655, - "narHash": "sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM=", + "lastModified": 1767780135, + "narHash": "sha256-5SbmsLMgxzPd9YMbFR4IHfOXv6bjWs+dfl6IbSq3r7s=", "owner": "nix-community", "repo": "home-manager", - "rev": "d49d2543f02dbd789ed032188c84570d929223cb", + "rev": "c08430923ed417abc653884328a39e98496cfd0f", "type": "github" }, "original": { @@ -379,11 +379,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767475907, - "narHash": "sha256-w10AFfl20h5MSBCsCegD4xtmcgDlQQeoFsOaIFwHOrE=", + "lastModified": 1767825194, + "narHash": "sha256-7/I9heGsLJ+pFv57aiu0Y7Cux39oL1HiZoGUNhzjvvs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7a0d60a03534a2d14b0805616aa1fd403fccfa55", + "rev": "4e97aaa1b4aa67df028dd8d116d08ba25bbcb7fb", "type": "github" }, "original": { @@ -395,11 +395,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -442,11 +442,11 @@ ] }, "locked": { - "lastModified": 1767472446, - "narHash": "sha256-MUj9BwcRCOh8VGaqvqiODowm+RQlU3BY7f5xfai6t0g=", + "lastModified": 1767836672, + "narHash": "sha256-n1fh/QF2H6pb5HV4+ANL5cguSypv9SFMiZvc1p4ZvYA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9b8a5f10d112bed916dd7222a6054af3e4f302a0", + "rev": "0b2365c909346ebfe7d19d0c3214e2fd340c4c02", "type": "github" }, "original": { @@ -517,11 +517,11 @@ ] }, "locked": { - "lastModified": 1767369300, - "narHash": "sha256-QV+tdP2bS+PJBcp4YHhqpMTzcxsxGaS/d6cKMCJ4PnA=", + "lastModified": 1767766515, + "narHash": "sha256-Hr87qJDIi4rL/d0njZYPyKDjtom6lDF3AV2UZL+K/fk=", "owner": "notashelf", "repo": "nvf", - "rev": "9c75c2a199af39fc95fb203636ce97d070ca3973", + "rev": "ceaae0eb2ece9e06159d6de80b0709e38d77f6a4", "type": "github" }, "original": { From 6e8d5a235153c926200a0c1d39182a7e3bd8df6c Mon Sep 17 00:00:00 2001 From: Don Williams Date: Wed, 7 Jan 2026 21:09:40 -0500 Subject: [PATCH 079/232] Updated CHANGELOG On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: CHANGELOG.md --- CHANGELOG.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c16603..62ccebb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,22 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** +#### 📅 **Updated: January 6th, 2026** + +- Disabled `noctalia-shell` service + - Caused old version to be loaded + - Re-Added `noctalia-shell` to Hyprland startup +- Removed `pypr` from Hyprland startup + - `pyprland` isn't used by default anymore +- Fixed error in waybar file +- Fixed `alejandra` error running `nix fmt` + - As a result of changing to `nix-systems` + #### 📅 **Updated: January 3rd, 2026** - Changed: - moved to `nix-systems` - - better managemenmt of Architecture types + - better management of Architecture types - Fixed: - Pressing a key now also does DPMS wakeup - Noctalia Shell started twice From ac43e57694035e4f72cb0947b9e54bf4d1f969a7 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Wed, 7 Jan 2026 22:36:46 -0500 Subject: [PATCH 080/232] Updated flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 018ebb2..6856871 100644 --- a/flake.lock +++ b/flake.lock @@ -379,11 +379,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767825194, - "narHash": "sha256-7/I9heGsLJ+pFv57aiu0Y7Cux39oL1HiZoGUNhzjvvs=", + "lastModified": 1767836852, + "narHash": "sha256-YuMSEpQUm1Mn3/c2iV5I/I0TfaGegRxVDNhUsIkJk4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4e97aaa1b4aa67df028dd8d116d08ba25bbcb7fb", + "rev": "16dad577632806d97eae119c0d71b05664c18dbf", "type": "github" }, "original": { @@ -442,11 +442,11 @@ ] }, "locked": { - "lastModified": 1767836672, - "narHash": "sha256-n1fh/QF2H6pb5HV4+ANL5cguSypv9SFMiZvc1p4ZvYA=", + "lastModified": 1767842137, + "narHash": "sha256-xfCKfNsDG6ra9fWjJu4Ma6EowMRwWjbY+xydwRMHTmQ=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "0b2365c909346ebfe7d19d0c3214e2fd340c4c02", + "rev": "e18689f027bb84692a208c54a5ab77dc248418ed", "type": "github" }, "original": { From 90706ee726c0ce45a32848784e01f9b2add280ea Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 8 Jan 2026 05:02:06 -0500 Subject: [PATCH 081/232] Ran analysis on zos-next vs main On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: new file: ZaneyOS-zos-next-PreMerge-check-1-8.25.md --- ZaneyOS-zos-next-PreMerge-check-1-8.25.md | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 ZaneyOS-zos-next-PreMerge-check-1-8.25.md diff --git a/ZaneyOS-zos-next-PreMerge-check-1-8.25.md b/ZaneyOS-zos-next-PreMerge-check-1-8.25.md new file mode 100644 index 0000000..965c874 --- /dev/null +++ b/ZaneyOS-zos-next-PreMerge-check-1-8.25.md @@ -0,0 +1,25 @@ +# Pre-Merge Check — zos-next vs main (2026-01-08) + +## Merge blockers + +- `flake.nix` no longer passes `system` into `nixpkgs.lib.nixosSystem`; evaluation will fail. Add `system = "";`. +- `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//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. From 0fc2f6cc5ba798762d0f462c44c78be07ced0500 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 15 Jan 2026 09:54:15 -0500 Subject: [PATCH 082/232] Updted flake set qs -c noctalia-shell to start --- flake.lock | 121 ++++++++++++++-------------- modules/home/hyprland/binds.nix | 22 ++--- modules/home/hyprland/exec-once.nix | 2 +- 3 files changed, 73 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index 6856871..c159c50 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1766394679, - "narHash": "sha256-huyKMNTvsqawI1mHocntSV4UcthHNfg21J9PQ3fByHg=", + "lastModified": 1768422311, + "narHash": "sha256-91sJfFjQC999KOkMCGEcfk9GyQ8Ve9MzN27kKsoiORw=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "89f5f9da4a42f7af91cd941ed8d1b81e99c5007d", + "rev": "5a12fae3b38571188abac90452bdb28e3b3a8623", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764724327, - "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -171,11 +171,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -240,11 +240,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1764524476, - "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab" }, "original": { @@ -262,11 +262,11 @@ ] }, "locked": { - "lastModified": 1767780135, - "narHash": "sha256-5SbmsLMgxzPd9YMbFR4IHfOXv6bjWs+dfl6IbSq3r7s=", + "lastModified": 1767910483, + "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c08430923ed417abc653884328a39e98496cfd0f", + "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", "type": "github" }, "original": { @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1765682243, - "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -327,11 +327,11 @@ }, "mnw": { "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "lastModified": 1767030222, + "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "rev": "75bb637454b0fbbb5ed652375a4bf7ffd28bcf6f", "type": "github" }, "original": { @@ -348,26 +348,27 @@ ] }, "locked": { - "lastModified": 1765720983, - "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", "owner": "feel-co", "repo": "ndg", - "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", "type": "github" }, "original": { "owner": "feel-co", + "ref": "refs/tags/v2.6.0", "repo": "ndg", "type": "github" } }, "nix-flatpak": { "locked": { - "lastModified": 1739444422, - "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "lastModified": 1767983141, + "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "rev": "440818969ac2cbd77bfe025e884d0aa528991374", "type": "github" }, "original": { @@ -379,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767836852, - "narHash": "sha256-YuMSEpQUm1Mn3/c2iV5I/I0TfaGegRxVDNhUsIkJk4g=", + "lastModified": 1768482676, + "narHash": "sha256-vNDXHdaRMJkMPBv1bge27ZUjEEuui9+k274npHhIawk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16dad577632806d97eae119c0d71b05664c18dbf", + "rev": "85a9c242982a807a1526bed7a4043f4ade99dec8", "type": "github" }, "original": { @@ -395,11 +396,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1768305791, + "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", "type": "github" }, "original": { @@ -442,11 +443,11 @@ ] }, "locked": { - "lastModified": 1767842137, - "narHash": "sha256-xfCKfNsDG6ra9fWjJu4Ma6EowMRwWjbY+xydwRMHTmQ=", + "lastModified": 1768483843, + "narHash": "sha256-KvaSckLD8KJw+kNkuXzntVJWLLkQ2NwW13YMCjp1jAQ=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "e18689f027bb84692a208c54a5ab77dc248418ed", + "rev": "662154f390b13759619140cbf7e8f3aad19a00f7", "type": "github" }, "original": { @@ -467,11 +468,11 @@ ] }, "locked": { - "lastModified": 1764773531, - "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "lastModified": 1767886815, + "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", "owner": "nix-community", "repo": "NUR", - "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", "type": "github" }, "original": { @@ -517,11 +518,11 @@ ] }, "locked": { - "lastModified": 1767766515, - "narHash": "sha256-Hr87qJDIi4rL/d0njZYPyKDjtom6lDF3AV2UZL+K/fk=", + "lastModified": 1768464392, + "narHash": "sha256-H3DRARqclUFdUaWgu1xQEb86/wrh41ZG0fIQJVjcZdE=", "owner": "notashelf", "repo": "nvf", - "rev": "ceaae0eb2ece9e06159d6de80b0709e38d77f6a4", + "rev": "007f14a2c8d67568f4655654b401871920d73011", "type": "github" }, "original": { @@ -568,11 +569,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1766603740, - "narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=", + "lastModified": 1767983286, + "narHash": "sha256-zuS1vcjZjtipzH1MgQUp/lRURIp6CXOVjGHQMQ1UBFI=", "owner": "danth", "repo": "stylix", - "rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0", + "rev": "5ad96253be7ee7f66298d28a24ac8faba8e0fe54", "type": "github" }, "original": { @@ -663,11 +664,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1763914658, - "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "lastModified": 1767817087, + "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "rev": "bd99656235aab343e3d597bf196df9bc67429507", "type": "github" }, "original": { @@ -679,11 +680,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1764465359, - "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -695,11 +696,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1764464512, - "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -716,11 +717,11 @@ ] }, "locked": { - "lastModified": 1766359145, - "narHash": "sha256-/HbtppVEx4kkyNWHE+4yQXwx413qNam4Tix4WiJakog=", + "lastModified": 1768270784, + "narHash": "sha256-Ybx8SbGtiGLKY+CHx/QSaPQo35AhbTF3JUZw6ZyZENE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5a0d4afa5a67a4e6df8116f97e27c10c9d47de6b", + "rev": "cd65e0cdc95726e75c15f514ea6daf8b21b1b1d9", "type": "github" }, "original": { diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 682bd00..657fdcb 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -9,17 +9,17 @@ noctaliaBind = if barChoice == "noctalia" then [ - "$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" - "$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" - "$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory" - "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" - "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" - "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" - "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" - "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" - "$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle" + "$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" + "$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" + "$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggleHistory" + "$modifier,V, Noctalia Clipboard, exec, qs -c noctalia-shell ipc call launcher clipboard" + "$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" + "$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" + "$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier SHIFT,W, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle" + "$modifier,X, Noctalia Power Menu, exec, qs -c noctalia-shell ipc call sessionMenu toggle" + "$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle" + "$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle" ] else []; # Rofi launcher bindings (only included when barChoice != "noctalia") diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index 3bd41b1..148edb4 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -8,7 +8,7 @@ "pkill waybar" "killall -q swaync" "pkill swaync" - "noctalia-shell &" + "qs -c noctalia-shell &" ] else []; # Waybar-specific startup commands From 343e37156923522af437fe5c981fb683cb61b90d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 15 Jan 2026 10:01:15 -0500 Subject: [PATCH 083/232] Getting noctalia to update on rebuilds/updates' --- modules/home/noctalia.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/home/noctalia.nix b/modules/home/noctalia.nix index fb25c11..1e62c18 100644 --- a/modules/home/noctalia.nix +++ b/modules/home/noctalia.nix @@ -3,13 +3,11 @@ inputs, lib, ... -}: -let +}: let system = pkgs.stdenv.hostPlatform.system; noctaliaPkg = inputs.noctalia.packages.${system}.default; configDir = "${noctaliaPkg}/share/noctalia-shell"; -in -{ +in { # Install the Noctalia package home.packages = [ noctaliaPkg @@ -17,12 +15,13 @@ in ]; # Seed the configuration - home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter ["writeBoundary"] '' set -eu DEST="$HOME/.config/quickshell/noctalia-shell" SRC="${configDir}" 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" From 4afdb00d4e4081db526af932f70b4e0cf7caae14 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 15 Jan 2026 10:11:39 -0500 Subject: [PATCH 084/232] Updated noctalia input --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c159c50..39158fc 100644 --- a/flake.lock +++ b/flake.lock @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1768483843, - "narHash": "sha256-KvaSckLD8KJw+kNkuXzntVJWLLkQ2NwW13YMCjp1jAQ=", + "lastModified": 1768489253, + "narHash": "sha256-XYhxxMwGEBTimoPcAlMZZojOYn6PIDE0EPI0HPkW74Y=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "662154f390b13759619140cbf7e8f3aad19a00f7", + "rev": "1544742f9e176b1a9352d46568b07c8aa54117a8", "type": "github" }, "original": { From f6eda0f4acd703df080814da8c732dc0902d7858 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 15 Jan 2026 11:48:56 -0500 Subject: [PATCH 085/232] Disable AntiGravity editor - compiles dotnet-vmr --- hosts/zaneyos-next/variables.nix | 2 +- modules/home/hyprland/binds.nix | 22 +++++++++++----------- modules/home/hyprland/exec-once.nix | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hosts/zaneyos-next/variables.nix b/hosts/zaneyos-next/variables.nix index 27c3ddc..f5ad030 100644 --- a/hosts/zaneyos-next/variables.nix +++ b/hosts/zaneyos-next/variables.nix @@ -31,7 +31,7 @@ _: { weztermEnable = true; ghosttyEnable = true; vscodeEnable = true; - antigravityEnable = true; # Google port of vscodium + antigravityEnable = false; # 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 diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 657fdcb..feb03e3 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -9,17 +9,17 @@ noctaliaBind = if barChoice == "noctalia" then [ - "$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" - "$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" - "$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggleHistory" - "$modifier,V, Noctalia Clipboard, exec, qs -c noctalia-shell ipc call launcher clipboard" - "$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" - "$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" - "$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend" - "$modifier SHIFT,W, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle" - "$modifier,X, Noctalia Power Menu, exec, qs -c noctalia-shell ipc call sessionMenu toggle" - "$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle" - "$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle" + "$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" + "$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" + "$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory" + "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" + "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" + "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" + "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" + "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" + "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" + "$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle" ] else []; # Rofi launcher bindings (only included when barChoice != "noctalia") diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index 148edb4..3bd41b1 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -8,7 +8,7 @@ "pkill waybar" "killall -q swaync" "pkill swaync" - "qs -c noctalia-shell &" + "noctalia-shell &" ] else []; # Waybar-specific startup commands From ae758cccef3f15bbdb3bf0cc437ac66fa9d0abe0 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Thu, 15 Jan 2026 17:01:52 -0500 Subject: [PATCH 086/232] 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 --- flake.lock | 157 ++++++++++++++-------------- hosts/zaneyos-24-vm/variables.nix | 2 +- modules/home/editors/evil-helix.nix | 3 +- modules/home/editors/nixvim.nix | 3 +- 4 files changed, 84 insertions(+), 81 deletions(-) diff --git a/flake.lock b/flake.lock index 646eb64..5f3dc02 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1751513446, - "narHash": "sha256-pnRh5ysSgMSOQxvL82sNJRwD/CiSYWplrGRU2WLoNKQ=", + "lastModified": 1768155355, + "narHash": "sha256-s0TBsxvGjl3Z4O3McFlKKq5CKCjFLYd/WGaROb3VkX0=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "c68bef57c1db3add865493d9cb741a14618bdc28", + "rev": "8f47c5e82ee8e6e8adcc1748be0056a1e349f7e8", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1766394679, - "narHash": "sha256-huyKMNTvsqawI1mHocntSV4UcthHNfg21J9PQ3fByHg=", + "lastModified": 1768422311, + "narHash": "sha256-91sJfFjQC999KOkMCGEcfk9GyQ8Ve9MzN27kKsoiORw=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "89f5f9da4a42f7af91cd941ed8d1b81e99c5007d", + "rev": "5a12fae3b38571188abac90452bdb28e3b3a8623", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1730615655, - "narHash": "sha256-2HBR3zLn57LXKNRtxBb+O+uDqHM4n0pz51rPayMl4cg=", + "lastModified": 1768113825, + "narHash": "sha256-f09fAifGPEuRrz1DFY910jexq0DaBuQBbq7WcxQIUgs=", "owner": "nix-community", "repo": "fenix", - "rev": "efeb50e2535b17ffd4a135e6e3e5fd60a525180c", + "rev": "55106e04d905c6a7726d0f6be77ed39a99f66a61", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764724327, - "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -215,11 +215,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -267,11 +267,11 @@ "flakeCompat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -300,11 +300,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1764524476, - "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1767780135, - "narHash": "sha256-5SbmsLMgxzPd9YMbFR4IHfOXv6bjWs+dfl6IbSq3r7s=", + "lastModified": 1767910483, + "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c08430923ed417abc653884328a39e98496cfd0f", + "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1765682243, - "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -387,11 +387,11 @@ }, "mnw": { "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "lastModified": 1767030222, + "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "rev": "75bb637454b0fbbb5ed652375a4bf7ffd28bcf6f", "type": "github" }, "original": { @@ -408,26 +408,27 @@ ] }, "locked": { - "lastModified": 1765720983, - "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", "owner": "feel-co", "repo": "ndg", - "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", "type": "github" }, "original": { "owner": "feel-co", + "ref": "refs/tags/v2.6.0", "repo": "ndg", "type": "github" } }, "nix-flatpak": { "locked": { - "lastModified": 1739444422, - "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "lastModified": 1767983141, + "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "rev": "440818969ac2cbd77bfe025e884d0aa528991374", "type": "github" }, "original": { @@ -439,11 +440,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767825194, - "narHash": "sha256-7/I9heGsLJ+pFv57aiu0Y7Cux39oL1HiZoGUNhzjvvs=", + "lastModified": 1768511334, + "narHash": "sha256-U7uCgkPjFmQFke78z0WDmcTWN3MsUzfg3khP/kpG6GI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4e97aaa1b4aa67df028dd8d116d08ba25bbcb7fb", + "rev": "f7f9b53efcc39c077235279579c464059a73f136", "type": "github" }, "original": { @@ -455,11 +456,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1768395095, + "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5", "type": "github" }, "original": { @@ -471,11 +472,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1767799921, + "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", "type": "github" }, "original": { @@ -495,11 +496,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1767448089, - "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=", + "lastModified": 1768486829, + "narHash": "sha256-G621Q9cB1roQxK0C6guNjmWX0CmPA5xN46VD2kTdDEk=", "owner": "nix-community", "repo": "nixvim", - "rev": "983751b66f255bbea1adc185364e9e7b73f82358", + "rev": "503259b749971f431cb4aca7099cd60eadd7a613", "type": "github" }, "original": { @@ -516,11 +517,11 @@ ] }, "locked": { - "lastModified": 1767836672, - "narHash": "sha256-n1fh/QF2H6pb5HV4+ANL5cguSypv9SFMiZvc1p4ZvYA=", + "lastModified": 1768509467, + "narHash": "sha256-m8KdxKAr4qzRXDd27PGnsxS/ICM0MwuLWl6OqQRQGRQ=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "0b2365c909346ebfe7d19d0c3214e2fd340c4c02", + "rev": "476f01e09484aa158260aeae3187754000cec837", "type": "github" }, "original": { @@ -541,11 +542,11 @@ ] }, "locked": { - "lastModified": 1764773531, - "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "lastModified": 1767886815, + "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", "owner": "nix-community", "repo": "NUR", - "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", "type": "github" }, "original": { @@ -587,11 +588,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1767766515, - "narHash": "sha256-Hr87qJDIi4rL/d0njZYPyKDjtom6lDF3AV2UZL+K/fk=", + "lastModified": 1768464392, + "narHash": "sha256-H3DRARqclUFdUaWgu1xQEb86/wrh41ZG0fIQJVjcZdE=", "owner": "notashelf", "repo": "nvf", - "rev": "ceaae0eb2ece9e06159d6de80b0709e38d77f6a4", + "rev": "007f14a2c8d67568f4655654b401871920d73011", "type": "github" }, "original": { @@ -617,11 +618,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1730555913, - "narHash": "sha256-KNHZUlqsEibg3YtfUyOFQSofP8hp1HKoY+laoesBxRM=", + "lastModified": 1768083390, + "narHash": "sha256-TGWPJq2mXwxfAe83iZ18DIqXC4sOSj7RkW9b59h6Ox4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "f17a5bbfd0969ba2e63a74505a80e55ecb174ed9", + "rev": "e42e8ff582ba12a88b6845525d08b6428e6d0fb9", "type": "github" }, "original": { @@ -650,11 +651,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1766603740, - "narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=", + "lastModified": 1768493544, + "narHash": "sha256-9qk2W/6GJWLAFXNruK/zdJ0bm3bfP50vJFbtuAjQpa4=", "owner": "danth", "repo": "stylix", - "rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0", + "rev": "362306faaa7459bebf8eabf135879785f3da9bd2", "type": "github" }, "original": { @@ -775,11 +776,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1763914658, - "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "lastModified": 1767817087, + "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "rev": "bd99656235aab343e3d597bf196df9bc67429507", "type": "github" }, "original": { @@ -791,11 +792,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1764465359, - "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -807,11 +808,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1764464512, - "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -828,11 +829,11 @@ ] }, "locked": { - "lastModified": 1766359145, - "narHash": "sha256-/HbtppVEx4kkyNWHE+4yQXwx413qNam4Tix4WiJakog=", + "lastModified": 1768270784, + "narHash": "sha256-Ybx8SbGtiGLKY+CHx/QSaPQo35AhbTF3JUZw6ZyZENE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5a0d4afa5a67a4e6df8116f97e27c10c9d47de6b", + "rev": "cd65e0cdc95726e75c15f514ea6daf8b21b1b1d9", "type": "github" }, "original": { diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix index e2d9a2f..09604d6 100644 --- a/hosts/zaneyos-24-vm/variables.nix +++ b/hosts/zaneyos-24-vm/variables.nix @@ -46,7 +46,7 @@ # This does NOT install your browser # You need to install it by adding it to the `packages.nix` # or as a flatpak - browser = "brave"; + browser = "google-chrome"; # Available Options: # Kitty, ghostty, wezterm, aalacrity diff --git a/modules/home/editors/evil-helix.nix b/modules/home/editors/evil-helix.nix index 67c447c..3204ffc 100644 --- a/modules/home/editors/evil-helix.nix +++ b/modules/home/editors/evil-helix.nix @@ -9,7 +9,8 @@ in { jsonnet-language-server luaformatter lua-language-server - marksman + #marksman # causes dotnet and dotnet-swr to build which takes hours + multimarkdown taplo nil jq-lsp diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index d96a717..94ca7e1 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -332,7 +332,8 @@ pyright lua-language-server zls - marksman + #marksman + multimarkdown clang-tools prettierd stylua From ce1355b40e552f61854494dcabeb5789f5daa71f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 15 Jan 2026 17:09:50 -0500 Subject: [PATCH 087/232] Changed markdown to multimarkdown markdown is .NET based and it caused dotnet and dotnet-swr to build from source. Which takes hours On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/editors/evil-helix.nix modified: modules/home/editors/nixvim.nix --- modules/home/editors/evil-helix.nix | 3 ++- modules/home/editors/nixvim.nix | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/home/editors/evil-helix.nix b/modules/home/editors/evil-helix.nix index 8b84baf..39a2fe3 100644 --- a/modules/home/editors/evil-helix.nix +++ b/modules/home/editors/evil-helix.nix @@ -11,7 +11,8 @@ lib.mkIf zaneyos.helixEnable { jsonnet-language-server luaformatter lua-language-server - marksman + #Amarksman # NET based causes dotnet docnet-vmr to build (hours long) + multimarkdown taplo nil jq-lsp diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 68a4798..ea26cad 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -308,7 +308,10 @@ pyright lua-language-server zls - marksman + #markman is .NET based causes dotnet and dotnet-swr to build from source (hours long builds) + # switching to multimarkdown (C based) + #marksman + multimarkdown clang-tools prettierd stylua From e82f67e56ead815e67677433384b20b8ece88471 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 15 Jan 2026 17:40:47 -0500 Subject: [PATCH 088/232] Upd flake, changed markdown to multimarkdown Pkg markdown caused dotnet and dotnet-swr to compile, which takes hours switched to mulitmarkdown Now dotnet packages come compiled dotnet-wrapped On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: flake.lock modified: hosts/zaneyos-next/variables.nix modified: modules/core/packages.nix --- flake.lock | 24 ++++++++++++------------ hosts/zaneyos-next/variables.nix | 2 +- modules/core/packages.nix | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 39158fc..124ca5f 100644 --- a/flake.lock +++ b/flake.lock @@ -380,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768482676, - "narHash": "sha256-vNDXHdaRMJkMPBv1bge27ZUjEEuui9+k274npHhIawk=", + "lastModified": 1768515476, + "narHash": "sha256-fpvLyTRAzYSi8qQOZW9d/B/9+Fm2mEFGuAZlNWWjH/A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85a9c242982a807a1526bed7a4043f4ade99dec8", + "rev": "ef760dcf6aee230a660a40696fcd0b7d1741e6fe", "type": "github" }, "original": { @@ -422,11 +422,11 @@ ] }, "locked": { - "lastModified": 1767448089, - "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=", + "lastModified": 1768486829, + "narHash": "sha256-G621Q9cB1roQxK0C6guNjmWX0CmPA5xN46VD2kTdDEk=", "owner": "nix-community", "repo": "nixvim", - "rev": "983751b66f255bbea1adc185364e9e7b73f82358", + "rev": "503259b749971f431cb4aca7099cd60eadd7a613", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1768489253, - "narHash": "sha256-XYhxxMwGEBTimoPcAlMZZojOYn6PIDE0EPI0HPkW74Y=", + "lastModified": 1768515139, + "narHash": "sha256-9Os2E1HATAeEFiiNveXNzziCOxSXW7Tbyn+Wv8nPvYE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "1544742f9e176b1a9352d46568b07c8aa54117a8", + "rev": "548007724dd64cc4d7285b6d7abe9cac123e00ce", "type": "github" }, "original": { @@ -569,11 +569,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1767983286, - "narHash": "sha256-zuS1vcjZjtipzH1MgQUp/lRURIp6CXOVjGHQMQ1UBFI=", + "lastModified": 1768493544, + "narHash": "sha256-9qk2W/6GJWLAFXNruK/zdJ0bm3bfP50vJFbtuAjQpa4=", "owner": "danth", "repo": "stylix", - "rev": "5ad96253be7ee7f66298d28a24ac8faba8e0fe54", + "rev": "362306faaa7459bebf8eabf135879785f3da9bd2", "type": "github" }, "original": { diff --git a/hosts/zaneyos-next/variables.nix b/hosts/zaneyos-next/variables.nix index f5ad030..27c3ddc 100644 --- a/hosts/zaneyos-next/variables.nix +++ b/hosts/zaneyos-next/variables.nix @@ -31,7 +31,7 @@ _: { weztermEnable = true; ghosttyEnable = true; vscodeEnable = true; - antigravityEnable = false; # Google port of vscodium + 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 diff --git a/modules/core/packages.nix b/modules/core/packages.nix index a4a8fc6..f20a753 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -36,7 +36,6 @@ in { seahorse.enable = true; fuse.userAllowOther = true; mtr.enable = true; - adb.enable = true; hyprlock.enable = true; gnupg.agent = { enable = true; @@ -69,6 +68,7 @@ in { file-roller # Archive Manager gedit # Simple Graphical Text Editor gimp # Great Photo Editor + google-chrome # Browser mesa-demos # needed for inxi diag util tuigreet # The Login Manager (Sometimes Referred To As Display Manager) htop # Simple Terminal Based System Monitor From 7322a8ed85ea3bbcbd1a4535b168242557d241c1 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 16 Jan 2026 18:27:36 -0500 Subject: [PATCH 089/232] Edit README.md upd discord and current release links --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d39af24..d491010 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ 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) @@ -262,7 +262,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/stable-2.5.9/install-zaneyos.sh) ``` #### The install process will look something like this: @@ -293,7 +293,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 stable-2.5.9 --depth=1 ~/zaneyos cd zaneyos You can still run the `install.sh` script if you want to. From 75a72df7ae6b3b0dfd2c11f0fa63e10a2f1a8be5 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 16 Jan 2026 18:30:11 -0500 Subject: [PATCH 090/232] Edit README.md Removed bad link to Wiki --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d491010..778f08a 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,6 @@ Please do yourself a favor and - 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 From b52b0b635e0d33d0e0f90a2352eb7f0b7f3187ad Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 16 Jan 2026 18:42:16 -0500 Subject: [PATCH 091/232] Edit README.md Removed other Wiki references --- README.md | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 778f08a..544af75 100644 --- a/README.md +++ b/README.md @@ -55,13 +55,7 @@ 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 @@ -102,12 +96,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. -
- -Please do yourself a favor and -[read the wiki](https://zaney.org/wiki/zaneyos-2.3/). - -
#### 📦 How To Install Packages? @@ -307,13 +295,7 @@ cp -r hosts/default hosts/ git add . ``` -4. Edit `hosts//variables.nix`. - -5. Edit `flake.nix` and fill in your username, profile, and hostname. - -6. Generate your hardware.nix like so: - -``` +4. Edit `hosts//variab nixos-generate-config --show-hardware-config > hosts//hardware.nix ``` From 278a680f153095258b558a1c0ab112290348d73c Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 16 Jan 2026 18:46:47 -0500 Subject: [PATCH 092/232] Edit README.md Fixed date --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 544af75..13481b3 100644 --- a/README.md +++ b/README.md @@ -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. From 90409769ad4b14ba4b2279b7872e042fe70e867d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 16 Jan 2026 18:50:16 -0500 Subject: [PATCH 093/232] Edit README.es.md Updated dated, fixed discord link Removed wiki links --- README.es.md | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/README.es.md b/README.es.md index 799300d..3e6e51b 100644 --- a/README.es.md +++ b/README.es.md @@ -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,12 +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 @@ -89,12 +83,7 @@ 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. -
-Hazte un favor y -[lee el wiki](https://zaney.org/wiki/zaneyos-2.3/). - -
#### 📦 ¿Cómo instalo paquetes? @@ -109,9 +98,8 @@ 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. +- Contáctanos también en [Discord](https://discord.gg/XhZmNTnhtp) para una respuesta potencialmente más rápida. -- No olvides revisar el [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq) # Atajos de Hyprland @@ -240,7 +228,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/stable-2.5.9/install-zaneyos.sh) ``` #### El proceso de instalación se verá así: @@ -271,7 +259,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 stable-2.5.9 --depth=1 ~/zaneyos cd zaneyos También puedes ejecutar el script `install.sh` si quieres. From 5e0c53ec12caa7369e516d58254aaa4d1be546d8 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 20 Jan 2026 17:21:04 -0500 Subject: [PATCH 094/232] Update flake --- flake.lock | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 124ca5f..375ec54 100644 --- a/flake.lock +++ b/flake.lock @@ -262,11 +262,11 @@ ] }, "locked": { - "lastModified": 1767910483, - "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", + "lastModified": 1768603898, + "narHash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo=", "owner": "nix-community", "repo": "home-manager", - "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", + "rev": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c", "type": "github" }, "original": { @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1767104570, - "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", + "lastModified": 1768434960, + "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", + "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", "type": "github" }, "original": { @@ -327,11 +327,11 @@ }, "mnw": { "locked": { - "lastModified": 1767030222, + "lastModified": 1768701608, "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=", "owner": "Gerg-L", "repo": "mnw", - "rev": "75bb637454b0fbbb5ed652375a4bf7ffd28bcf6f", + "rev": "20d63a8a1ae400557c770052a46a9840e768926b", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768515476, - "narHash": "sha256-fpvLyTRAzYSi8qQOZW9d/B/9+Fm2mEFGuAZlNWWjH/A=", + "lastModified": 1768945443, + "narHash": "sha256-bhlHG2HSeDXddox9OUzgJOQl1sPzv5QXAiyMs2VQXQ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ef760dcf6aee230a660a40696fcd0b7d1741e6fe", + "rev": "8ddf1d2ed67377845500b94e5deae2eab06b7db4", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1768305791, - "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1768515139, - "narHash": "sha256-9Os2E1HATAeEFiiNveXNzziCOxSXW7Tbyn+Wv8nPvYE=", + "lastModified": 1768946050, + "narHash": "sha256-3PDfBy/2nWZmrUe2al4YsnB9gGwohaVOofR30XzPl6M=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "548007724dd64cc4d7285b6d7abe9cac123e00ce", + "rev": "cb3f6eb7432acc41dd83fe86129aa77b40fea11b", "type": "github" }, "original": { @@ -518,11 +518,11 @@ ] }, "locked": { - "lastModified": 1768464392, - "narHash": "sha256-H3DRARqclUFdUaWgu1xQEb86/wrh41ZG0fIQJVjcZdE=", + "lastModified": 1768906339, + "narHash": "sha256-iwkHIz2IYRcELkBoKXQUHlP0bFGmrHIz/roJUVYsyx8=", "owner": "notashelf", "repo": "nvf", - "rev": "007f14a2c8d67568f4655654b401871920d73011", + "rev": "18c55d3bebf2c704970b4ea6fd0261808bec8d94", "type": "github" }, "original": { @@ -717,11 +717,11 @@ ] }, "locked": { - "lastModified": 1768270784, - "narHash": "sha256-Ybx8SbGtiGLKY+CHx/QSaPQo35AhbTF3JUZw6ZyZENE=", + "lastModified": 1768847523, + "narHash": "sha256-Rpe8L91vImYuAH5Ct5S0Ua/AVYWEx2iwbSw5/zo0DlE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "cd65e0cdc95726e75c15f514ea6daf8b21b1b1d9", + "rev": "c46511888bcce28b5b54a82cb41d0ef75cd93965", "type": "github" }, "original": { From c2f9e6cec282398b4f3adb6b57888dc822e72ef8 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 23 Jan 2026 01:03:56 -0500 Subject: [PATCH 095/232] Updted flake - added additional fonts --- flake.lock | 48 +++++++++++++++++++++--------------------- modules/core/fonts.nix | 6 ++++++ 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 375ec54..c6700e9 100644 --- a/flake.lock +++ b/flake.lock @@ -129,11 +129,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -262,11 +262,11 @@ ] }, "locked": { - "lastModified": 1768603898, - "narHash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo=", + "lastModified": 1768949235, + "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c", + "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768945443, - "narHash": "sha256-bhlHG2HSeDXddox9OUzgJOQl1sPzv5QXAiyMs2VQXQ8=", + "lastModified": 1769142756, + "narHash": "sha256-BT1QsTPRX96Xxjg26SjN4edIwV7IYXyhY90VwZXmt7E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8ddf1d2ed67377845500b94e5deae2eab06b7db4", + "rev": "9bc3b9a66c9e7311975db3c31ca5f334dfb5cc3c", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -422,11 +422,11 @@ ] }, "locked": { - "lastModified": 1768486829, - "narHash": "sha256-G621Q9cB1roQxK0C6guNjmWX0CmPA5xN46VD2kTdDEk=", + "lastModified": 1769049374, + "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", "owner": "nix-community", "repo": "nixvim", - "rev": "503259b749971f431cb4aca7099cd60eadd7a613", + "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1768946050, - "narHash": "sha256-3PDfBy/2nWZmrUe2al4YsnB9gGwohaVOofR30XzPl6M=", + "lastModified": 1769145612, + "narHash": "sha256-uHtKorr5FamlD/WXSs7gJYYcsO9EGlVJhY/V4n4HmW4=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "cb3f6eb7432acc41dd83fe86129aa77b40fea11b", + "rev": "e4729d9b92346f86eeaccc6063506684575ea9ea", "type": "github" }, "original": { @@ -491,11 +491,11 @@ ] }, "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", + "lastModified": 1768249818, + "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=", "owner": "NuschtOS", "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", + "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796", "type": "github" }, "original": { @@ -518,11 +518,11 @@ ] }, "locked": { - "lastModified": 1768906339, - "narHash": "sha256-iwkHIz2IYRcELkBoKXQUHlP0bFGmrHIz/roJUVYsyx8=", + "lastModified": 1769111313, + "narHash": "sha256-2IU9TOe7BBG145mftfQW2aYxXxQd2YHfv8V1qTMFkmY=", "owner": "notashelf", "repo": "nvf", - "rev": "18c55d3bebf2c704970b4ea6fd0261808bec8d94", + "rev": "bebdddb5719ec2c3f86b0168a785d1a2aee1d857", "type": "github" }, "original": { diff --git a/modules/core/fonts.nix b/modules/core/fonts.nix index 4955f56..ff39e01 100644 --- a/modules/core/fonts.nix +++ b/modules/core/fonts.nix @@ -9,11 +9,17 @@ ibm-plex inter jetbrains-mono + lilex material-icons maple-mono.NF minecraftia nerd-fonts.im-writing nerd-fonts.blex-mono + nerd-fonts.iosevka-term + nerd-fonts.lilex + nerd-fonts.ubuntu + nerd-fonts.jetbrains-mono + nerd-fonts.fira-mono noto-fonts noto-fonts-color-emoji noto-fonts-cjk-sans From 4afc385c16dd777dfd285c963767cea2ad05c20e Mon Sep 17 00:00:00 2001 From: Kexuan Yang Date: Fri, 23 Jan 2026 22:37:22 +0800 Subject: [PATCH 096/232] Add `systemdTarget` to hypridle config --- modules/home/hyprland/hypridle.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/hyprland/hypridle.nix b/modules/home/hyprland/hypridle.nix index 3762aac..fe70347 100644 --- a/modules/home/hyprland/hypridle.nix +++ b/modules/home/hyprland/hypridle.nix @@ -2,6 +2,7 @@ services = { hypridle = { enable = true; + systemdTarget = "hyprland-session.target"; settings = { general = { after_sleep_cmd = "hyprctl dispatch dpms on"; From 6253bf8a29a4eba5566c561cdfda3bcf115f2691 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 23 Jan 2026 09:45:05 -0500 Subject: [PATCH 097/232] Added session-target to Hypridle.nix --- modules/home/hyprland/hypridle.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/hyprland/hypridle.nix b/modules/home/hyprland/hypridle.nix index 3762aac..fe70347 100644 --- a/modules/home/hyprland/hypridle.nix +++ b/modules/home/hyprland/hypridle.nix @@ -2,6 +2,7 @@ services = { hypridle = { enable = true; + systemdTarget = "hyprland-session.target"; settings = { general = { after_sleep_cmd = "hyprctl dispatch dpms on"; From 694cc69cc44d7677cf613d2c9235ff0fc86bf9c8 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 23 Jan 2026 09:54:11 -0500 Subject: [PATCH 098/232] 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 --- CHANGELOG.md | 8 ++++++++ modules/core/fonts.nix | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9479792..e9ce7db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,14 @@ # 🚀 **Current Release - ZaneyOS v2.5.9** +#### 📅 **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` diff --git a/modules/core/fonts.nix b/modules/core/fonts.nix index 4955f56..22b9e78 100644 --- a/modules/core/fonts.nix +++ b/modules/core/fonts.nix @@ -14,6 +14,11 @@ minecraftia nerd-fonts.im-writing nerd-fonts.blex-mono + nerd-fonts.iosevka-term + nerd-fonts.lilex + nerd-fonts.ubuntu + nerd-fonts.jetbrains-mono + nerd-fonts.fira-mono noto-fonts noto-fonts-color-emoji noto-fonts-cjk-sans From 220d94c7980991656d3edf617c9efdd42f2c8e7f Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 23 Jan 2026 23:01:34 -0500 Subject: [PATCH 099/232] Updated flake --- flake.lock | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 5f3dc02..c9aecc7 100644 --- a/flake.lock +++ b/flake.lock @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1767910483, - "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", + "lastModified": 1768949235, + "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=", "owner": "nix-community", "repo": "home-manager", - "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", + "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1767104570, - "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", + "lastModified": 1768434960, + "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", + "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", "type": "github" }, "original": { @@ -387,11 +387,11 @@ }, "mnw": { "locked": { - "lastModified": 1767030222, + "lastModified": 1768701608, "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=", "owner": "Gerg-L", "repo": "mnw", - "rev": "75bb637454b0fbbb5ed652375a4bf7ffd28bcf6f", + "rev": "20d63a8a1ae400557c770052a46a9840e768926b", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768511334, - "narHash": "sha256-U7uCgkPjFmQFke78z0WDmcTWN3MsUzfg3khP/kpG6GI=", + "lastModified": 1769222102, + "narHash": "sha256-xaovjneEbMGufZJw3oYPTkntxmHpr1Jar/zYcKvBLHQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f7f9b53efcc39c077235279579c464059a73f136", + "rev": "fac67f33e581e2804eac8b20160ef6c98e8c09a2", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1768395095, - "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=", + "lastModified": 1768875095, + "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5", + "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0", "type": "github" }, "original": { @@ -496,11 +496,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1768486829, - "narHash": "sha256-G621Q9cB1roQxK0C6guNjmWX0CmPA5xN46VD2kTdDEk=", + "lastModified": 1769049374, + "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", "owner": "nix-community", "repo": "nixvim", - "rev": "503259b749971f431cb4aca7099cd60eadd7a613", + "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", "type": "github" }, "original": { @@ -517,11 +517,11 @@ ] }, "locked": { - "lastModified": 1768509467, - "narHash": "sha256-m8KdxKAr4qzRXDd27PGnsxS/ICM0MwuLWl6OqQRQGRQ=", + "lastModified": 1769225317, + "narHash": "sha256-13G2M6SLtp4m11bA9LAq6sUeI6G2rgaT/pYxgdmOQPA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "476f01e09484aa158260aeae3187754000cec837", + "rev": "69b40d4769be161f6a2d6ea27a1310df792ee9b8", "type": "github" }, "original": { @@ -565,11 +565,11 @@ ] }, "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", + "lastModified": 1768249818, + "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=", "owner": "NuschtOS", "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", + "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796", "type": "github" }, "original": { @@ -588,11 +588,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1768464392, - "narHash": "sha256-H3DRARqclUFdUaWgu1xQEb86/wrh41ZG0fIQJVjcZdE=", + "lastModified": 1769195674, + "narHash": "sha256-SBmkSDg5+2MvTklDAgIhPACdgXdZoSleBY/nIPUXHfU=", "owner": "notashelf", "repo": "nvf", - "rev": "007f14a2c8d67568f4655654b401871920d73011", + "rev": "385c49d93dd93fc745b954b4bd777ce458f01948", "type": "github" }, "original": { @@ -651,11 +651,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768493544, - "narHash": "sha256-9qk2W/6GJWLAFXNruK/zdJ0bm3bfP50vJFbtuAjQpa4=", + "lastModified": 1769202415, + "narHash": "sha256-6XUTQjam/xLFGeJFj9XCo+12XSxd2iBxkAdLe6IJqiw=", "owner": "danth", "repo": "stylix", - "rev": "362306faaa7459bebf8eabf135879785f3da9bd2", + "rev": "296aa01b461af5146612cd26cc115c1d3e5ed4ae", "type": "github" }, "original": { @@ -829,11 +829,11 @@ ] }, "locked": { - "lastModified": 1768270784, - "narHash": "sha256-Ybx8SbGtiGLKY+CHx/QSaPQo35AhbTF3JUZw6ZyZENE=", + "lastModified": 1769201724, + "narHash": "sha256-jejW3u1bkqz0ObXZeiZqLQNwC7+MXb8/KMwf3VPQpRI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "cd65e0cdc95726e75c15f514ea6daf8b21b1b1d9", + "rev": "0fac05e4b604c3304e7710a95572e78350fe9968", "type": "github" }, "original": { From f78bb9b67d4ca38e603bd9875e7326268f90eb06 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 26 Jan 2026 09:10:58 -0500 Subject: [PATCH 100/232] Added overrides for default apps per host On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: FAQ.es.md modified: FAQ.md modified: hosts/default/variables.nix modified: hosts/nixstation/variables.nix modified: hosts/zaneyos-24-vm/variables.nix modified: hosts/zaneyos-next/variables.nix modified: hosts/zaneyos-oem/variables.nix modified: modules/home/xdg.nix modified: modules/options.nix --- FAQ.es.md | 28 ++++++++++++++++++++++++++++ FAQ.md | 28 ++++++++++++++++++++++++++++ hosts/default/variables.nix | 19 +++++++++++++++++++ hosts/nixstation/variables.nix | 19 +++++++++++++++++++ hosts/zaneyos-24-vm/variables.nix | 19 +++++++++++++++++++ hosts/zaneyos-next/variables.nix | 19 +++++++++++++++++++ hosts/zaneyos-oem/variables.nix | 19 +++++++++++++++++++ modules/home/xdg.nix | 29 ++++++++++++++++++++++++++++- modules/options.nix | 15 +++++++++++++++ 9 files changed, 194 insertions(+), 1 deletion(-) diff --git a/FAQ.es.md b/FAQ.es.md index b709bad..3b2483c 100644 --- a/FAQ.es.md +++ b/FAQ.es.md @@ -238,6 +238,34 @@ fácil referencia.
+
+**¿Cómo configuro aplicaciones predeterminadas (PDF, navegador) por host?** + +- Edita `~/zaneyos/hosts//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 + # }; +}; +``` + +
+
**¿Cómo agrego flatpaks?** diff --git a/FAQ.md b/FAQ.md index ab6e9f3..b67e47c 100644 --- a/FAQ.md +++ b/FAQ.md @@ -228,6 +228,34 @@ Below are the keybindings for Hyprland, formatted for easy reference.
+
+**How do I set default apps (PDF, browser) per host?** + +- Edit `~/zaneyos/hosts//variables.nix` inside the `zaneyos = { ... }` block and uncomment `mimeDefaultApps`. +- Home Manager consumes `zaneyos.mimeDefaultApps` via `modules/home/xdg.nix` and writes `~/.config/mimeapps.list`. +- Use real `.desktop` IDs from `/usr/share/applications` or `~/.local/share/applications`. + +```nix +zaneyos = { + # ... other settings ... + # Default applications (picked up by HM xdg.mimeApps) + # mimeDefaultApps = { + # # PDFs + # "application/pdf" = ["okular.desktop"]; + # "application/x-pdf" = ["okular.desktop"]; + # # Web browser + # "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop + # "x-scheme-handler/https" = ["google-chrome.desktop"]; + # "text/html" = ["google-chrome.desktop"]; + # # Files + # "inode/directory" = ["thunar.desktop"]; # file manager + # "text/plain" = ["nvim.desktop"]; # or code.desktop + # }; +}; +``` + +
+
**How to I add flatpaks? ?** diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index eaf720b..b256d24 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -51,6 +51,25 @@ _: { # or as a flatpak browser = "brave"; + # Default applications for this host (written to ~/.config/mimeapps.list) + # Uncomment and adjust to set per-host defaults. + # mimeDefaultApps = { + # # PDFs + # "application/pdf" = ["okular.desktop"]; + # "application/x-pdf" = ["okular.desktop"]; + # # Web browser + # "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop + # "x-scheme-handler/https" = ["google-chrome.desktop"]; + # "text/html" = ["google-chrome.desktop"]; + # # Text files + # "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop + # # Images and video + # "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop + # "video/mp4" = ["mpv.desktop"]; # or vlc.desktop + # # Folders (file manager) + # "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop + # }; + # Available Options: # Kitty, ghostty, wezterm, aalacrity # Note: kitty, wezterm, alacritty have to be enabled in `variables.nix` diff --git a/hosts/nixstation/variables.nix b/hosts/nixstation/variables.nix index df62f78..e6e47e3 100644 --- a/hosts/nixstation/variables.nix +++ b/hosts/nixstation/variables.nix @@ -44,6 +44,25 @@ _: { # Program Options browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) + + # Default applications for this host (written to ~/.config/mimeapps.list) + # Uncomment and adjust to set per-host defaults. + # mimeDefaultApps = { + # # PDFs + # "application/pdf" = ["okular.desktop"]; + # "application/x-pdf" = ["okular.desktop"]; + # # Web browser + # "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop + # "x-scheme-handler/https" = ["google-chrome.desktop"]; + # "text/html" = ["google-chrome.desktop"]; + # # Text files + # "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop + # # Images and video + # "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop + # "video/mp4" = ["mpv.desktop"]; # or vlc.desktop + # # Folders (file manager) + # "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop + # }; terminal = "kitty"; # Set Default System Terminal keyboardLayout = "us"; consoleKeyMap = "us"; diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix index 14f354d..30d94d9 100644 --- a/hosts/zaneyos-24-vm/variables.nix +++ b/hosts/zaneyos-24-vm/variables.nix @@ -64,6 +64,25 @@ _: { # or as a flatpak browser = "brave"; + # Default applications for this host (written to ~/.config/mimeapps.list) + # Uncomment and adjust to set per-host defaults. + # mimeDefaultApps = { + # # PDFs + # "application/pdf" = ["okular.desktop"]; + # "application/x-pdf" = ["okular.desktop"]; + # # Web browser + # "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop + # "x-scheme-handler/https" = ["google-chrome.desktop"]; + # "text/html" = ["google-chrome.desktop"]; + # # Text files + # "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop + # # Images and video + # "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop + # "video/mp4" = ["mpv.desktop"]; # or vlc.desktop + # # Folders (file manager) + # "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop + # }; + # Available Options: # Kitty, ghostty, wezterm, aalacrity # Note: kitty, wezterm, alacritty have to be enabled in `variables.nix` diff --git a/hosts/zaneyos-next/variables.nix b/hosts/zaneyos-next/variables.nix index 27c3ddc..356a233 100644 --- a/hosts/zaneyos-next/variables.nix +++ b/hosts/zaneyos-next/variables.nix @@ -51,6 +51,25 @@ _: { # or as a flatpak browser = "brave"; + # Default applications for this host (written to ~/.config/mimeapps.list) + # Uncomment and adjust to set per-host defaults. + # mimeDefaultApps = { + # # PDFs + # "application/pdf" = ["okular.desktop"]; + # "application/x-pdf" = ["okular.desktop"]; + # # Web browser + # "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop + # "x-scheme-handler/https" = ["google-chrome.desktop"]; + # "text/html" = ["google-chrome.desktop"]; + # # Text files + # "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop + # # Images and video + # "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop + # "video/mp4" = ["mpv.desktop"]; # or vlc.desktop + # # Folders (file manager) + # "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop + # }; + # Available Options: # Kitty, ghostty, wezterm, aalacrity # Note: kitty, wezterm, alacritty have to be enabled in `variables.nix` diff --git a/hosts/zaneyos-oem/variables.nix b/hosts/zaneyos-oem/variables.nix index 3ae3bcd..757f689 100644 --- a/hosts/zaneyos-oem/variables.nix +++ b/hosts/zaneyos-oem/variables.nix @@ -44,6 +44,25 @@ _: { # Program Options browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) + + # Default applications for this host (written to ~/.config/mimeapps.list) + # Uncomment and adjust to set per-host defaults. + # mimeDefaultApps = { + # # PDFs + # "application/pdf" = ["okular.desktop"]; + # "application/x-pdf" = ["okular.desktop"]; + # # Web browser + # "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop + # "x-scheme-handler/https" = ["google-chrome.desktop"]; + # "text/html" = ["google-chrome.desktop"]; + # # Text files + # "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop + # # Images and video + # "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop + # "video/mp4" = ["mpv.desktop"]; # or vlc.desktop + # # Folders (file manager) + # "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop + # }; terminal = "kitty"; # Set Default System Terminal keyboardLayout = "us"; keyboardVariant = ""; diff --git a/modules/home/xdg.nix b/modules/home/xdg.nix index 82b4b63..f6ed94e 100644 --- a/modules/home/xdg.nix +++ b/modules/home/xdg.nix @@ -1,9 +1,36 @@ -{pkgs, ...}: { +{pkgs, zaneyos, lib, ...}: { xdg = { enable = true; mime.enable = true; mimeApps = { enable = true; + # Use per-host defaults when provided via zaneyos.mimeDefaultApps + defaultApplications = lib.mkIf (zaneyos ? mimeDefaultApps && zaneyos.mimeDefaultApps != {}) zaneyos.mimeDefaultApps; + + # Examples: uncomment to set defaults here (host-level preferred via zaneyos.mimeDefaultApps) + # defaultApplications = { + # # PDFs + # "application/pdf" = ["okular.desktop"]; # change to your preferred reader + # "application/x-pdf" = ["okular.desktop"]; # legacy alias + # + # # Web browser + # "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop, etc. + # "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 + # + # # Archives + # "application/zip" = ["org.gnome.FileRoller.desktop"]; # or xarchiver.desktop, peazip.desktop + # + # # Folders (file manager) + # "inode/directory" = ["thunar.desktop"]; # or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop + # }; }; portal = { enable = true; diff --git a/modules/options.nix b/modules/options.nix index 00fadb2..d54579a 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -240,5 +240,20 @@ with lib; { default = "5ab03f50"; description = "Network hostId."; }; + + # Default applications per MIME type (consumed by Home Manager xdg.mimeApps) + # Example value: + # { + # "application/pdf" = ["okular.desktop"]; # PDF handler + # "x-scheme-handler/http" = ["google-chrome.desktop"]; # Browser + # } + mimeDefaultApps = mkOption { + type = types.attrsOf (types.listOf types.str); + default = {}; + description = '' + Attribute set mapping MIME types or URL schemes to lists of .desktop IDs. + Applied to xdg.mimeApps.defaultApplications for the user on this host. + ''; + }; }; } From f612693b8fa3167962c2d2aea63574ca1e081bea Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 26 Jan 2026 18:59:17 -0500 Subject: [PATCH 101/232] Added fonts, added support for setting app defaults per host --- CHANGELOG.md | 157 ++++++++++++++++++++++++++++++ FAQ.es.md | 26 +++++ FAQ.md | 26 +++++ flake.lock | 34 +++---- hosts/default/variables.nix | 15 +++ hosts/nixstation/variables.nix | 16 +++ hosts/zaneyos-24-vm/variables.nix | 15 +++ hosts/zaneyos-oem/variables.nix | 16 +++ modules/home/hyprland/binds.nix | 22 ++--- modules/home/noctalia.nix | 23 +++++ modules/home/xdg.nix | 33 ++++++- 11 files changed, 354 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9ce7db..08ececb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -191,6 +191,163 @@ #### 📅 **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 + rn - Rename symbol + 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 + ff - Find files + fm - Find media files + lg - Live grep + fe - File explorer toggle + t - Toggle terminal + . - Toggle comment (line/visual) + z - Zen mode + Z - Zoom + gg - Lazygit + - Terminal (via snacks) + ]t / [t - Next/prev TODO comment + n - Notification history + ``` + +#### 📅 **Updated: December 21st, 2025** + - Updated: - `nixvim.nix` now uses `blink-cmp` for completion/suggestions - This replaces `nvim-cmp` diff --git a/FAQ.es.md b/FAQ.es.md index 5f8fe26..7b9bcbc 100644 --- a/FAQ.es.md +++ b/FAQ.es.md @@ -139,6 +139,32 @@ zcli doom status # Verifica estado de instalación
+
+**¿Cómo configuro aplicaciones predeterminadas (PDF, navegador) por host?** + +- Edita `~/zaneyos/hosts//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//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 +# }; +``` + +
+ ## Atajos Principales de Hyprland A continuación se muestran los atajos de teclado para Hyprland, formateados para diff --git a/FAQ.md b/FAQ.md index 3988d6a..1c1b2ab 100644 --- a/FAQ.md +++ b/FAQ.md @@ -228,6 +228,32 @@ Below are the keybindings for Hyprland, formatted for easy reference.
+
+**How do I set default apps (PDF, browser) per host?** + +- Edit `~/zaneyos/hosts//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 +# hosts//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 +# }; +``` + +
+
**How to I add flatpaks? ?** diff --git a/flake.lock b/flake.lock index c9aecc7..695e38a 100644 --- a/flake.lock +++ b/flake.lock @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1768949235, - "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=", + "lastModified": 1767024057, + "narHash": "sha256-B1aycRjMRvb6QOGbnqDhiDzZwMebj5jxZ5qyJzaKvpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5", + "rev": "34578a2fdfce4257ce5f5baf6e7efbd4e4e252b1", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769222102, - "narHash": "sha256-xaovjneEbMGufZJw3oYPTkntxmHpr1Jar/zYcKvBLHQ=", + "lastModified": 1767155843, + "narHash": "sha256-pby+ao19K1KQ/Ug8wL5yCcNydhHmnyaFnJZvW1putpU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fac67f33e581e2804eac8b20160ef6c98e8c09a2", + "rev": "129e7faa03027471fe3a92d3bab022434089ab1a", "type": "github" }, "original": { @@ -456,8 +456,8 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1768875095, - "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", + "lastModified": 1764081664, + "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=", "owner": "nixos", "repo": "nixpkgs", "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0", @@ -496,11 +496,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1769049374, - "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", + "lastModified": 1766849711, + "narHash": "sha256-gtLBwhgjERca1UCzGkFplD5epIVRiNkePHVVtyFr73g=", "owner": "nix-community", "repo": "nixvim", - "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", + "rev": "cae79c48e93bd61e478dfc12456bf68b1ce66074", "type": "github" }, "original": { @@ -517,11 +517,11 @@ ] }, "locked": { - "lastModified": 1769225317, - "narHash": "sha256-13G2M6SLtp4m11bA9LAq6sUeI6G2rgaT/pYxgdmOQPA=", + "lastModified": 1767140690, + "narHash": "sha256-FemE1tu5FgtlfDD9Vwgk7fA3qg1xsOZKNMapZcB+/LE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "69b40d4769be161f6a2d6ea27a1310df792ee9b8", + "rev": "a3e277ce20dc3401afb7887c089395b0ad0d3108", "type": "github" }, "original": { @@ -588,11 +588,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1769195674, - "narHash": "sha256-SBmkSDg5+2MvTklDAgIhPACdgXdZoSleBY/nIPUXHfU=", + "lastModified": 1767123832, + "narHash": "sha256-WI+DaMQLJ/QVUKCNk1gvo8y0Rw6C4uDx8BW1mRVVOMU=", "owner": "notashelf", "repo": "nvf", - "rev": "385c49d93dd93fc745b954b4bd777ce458f01948", + "rev": "0390abd6736ff34a016afc66366d1f46372f28de", "type": "github" }, "original": { diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index d047a08..c44ab35 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -47,6 +47,21 @@ # or as a flatpak browser = "brave"; + # Host-level default applications (picked up by Home Manager xdg.mimeApps) + # Uncomment and adjust the .desktop IDs to set per-host defaults. + # mimeDefaultApps = { + # # PDFs + # "application/pdf" = ["okular.desktop"]; + # "application/x-pdf" = ["okular.desktop"]; + # # Web browser + # "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop + # "x-scheme-handler/https" = ["google-chrome.desktop"]; + # "text/html" = ["google-chrome.desktop"]; + # # Files + # "inode/directory" = ["thunar.desktop"]; # file manager + # "text/plain" = ["nvim.desktop"]; # or code.desktop + # }; + # Available Options: # Kitty, ghostty, wezterm, aalacrity # Note: kitty, wezterm, alacritty have to be enabled in `variables.nix` diff --git a/hosts/nixstation/variables.nix b/hosts/nixstation/variables.nix index f3f01b6..d30ffcb 100644 --- a/hosts/nixstation/variables.nix +++ b/hosts/nixstation/variables.nix @@ -38,6 +38,22 @@ # Program Options browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) + + # 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 + # }; + terminal = "kitty"; # Set Default System Terminal keyboardLayout = "us"; consoleKeyMap = "us"; diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix index 09604d6..d0a1a7b 100644 --- a/hosts/zaneyos-24-vm/variables.nix +++ b/hosts/zaneyos-24-vm/variables.nix @@ -48,6 +48,21 @@ # or as a flatpak browser = "google-chrome"; + # 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` diff --git a/hosts/zaneyos-oem/variables.nix b/hosts/zaneyos-oem/variables.nix index 3412fcf..937ccec 100644 --- a/hosts/zaneyos-oem/variables.nix +++ b/hosts/zaneyos-oem/variables.nix @@ -38,6 +38,22 @@ # Program Options browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) + + # 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 + # }; + terminal = "kitty"; # Set Default System Terminal keyboardLayout = "us"; keyboardVariant = ""; diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 2557548..f6a87ca 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -10,17 +10,17 @@ noctaliaBind = if barChoice == "noctalia" then [ - "$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" - "$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" - "$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory" - "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" - "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" - "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" - "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" - "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" - "$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle" + "$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" + "$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" + "$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggleHistory" + "$modifier,V, Noctalia Clipboard, exec, qs -c noctalia-shell ipc call launcher clipboard" + "$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" + "$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" + "$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier SHIFT,W, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle" + "$modifier,X, Noctalia Power Menu, exec, qs -c noctalia-shell ipc call sessionMenu toggle" + "$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle" + "$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle" ] else []; # Rofi launcher bindings (only included when barChoice != "noctalia") diff --git a/modules/home/noctalia.nix b/modules/home/noctalia.nix index fb25c11..945576a 100644 --- a/modules/home/noctalia.nix +++ b/modules/home/noctalia.nix @@ -28,4 +28,27 @@ in $DRY_RUN_CMD chmod -R u+rwX "$DEST" fi ''; + + # Enable the noctalia-shell systemd user service + systemd.user.services.noctalia-shell = { + Unit = { + Description = "Noctalia Shell - Wayland desktop shell"; + Documentation = "https://docs.noctalia.dev/docs"; + PartOf = ["graphical-session.target"]; + After = ["graphical-session-pre.target"]; + Wants = ["graphical-session-target"]; + }; + Service = { + ExecStart = "${pkgs.quickshell}/bin/quickshell --path %h/.config/quickshell/noctalia-shell"; + Restart = "always"; + RestartSec = 5; + Environment = [ + "QML_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" + "QML2_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" + ]; + }; + Install = { + WantedBy = ["graphical-session.target"]; + }; + }; } diff --git a/modules/home/xdg.nix b/modules/home/xdg.nix index 82b4b63..765260e 100644 --- a/modules/home/xdg.nix +++ b/modules/home/xdg.nix @@ -1,9 +1,40 @@ -{pkgs, ...}: { +{pkgs, host, lib, ...}: let + vars = import ../../hosts/${host}/variables.nix; +in { xdg = { enable = true; mime.enable = true; mimeApps = { enable = true; + # If the host defines mimeDefaultApps in hosts/${host}/variables.nix, + # use it to set per-host default applications. + defaultApplications = lib.mkIf (vars ? mimeDefaultApps) vars.mimeDefaultApps; + + # Example: set default handlers for MIME types and URL schemes. + # Uncomment the block below and adjust .desktop IDs to your preferred apps. + # defaultApplications = { + # # PDFs + # "application/pdf" = ["okular.desktop"]; # change to your preferred reader + # "application/x-pdf" = ["okular.desktop"]; # legacy alias + # + # # Web browser + # "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop, etc. + # "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 + # + # # Archives + # "application/zip" = ["org.gnome.FileRoller.desktop"]; # or xarchiver.desktop, peazip.desktop + # + # # Folders (file manager) + # "inode/directory" = ["thunar.desktop"]; # or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop + # }; }; portal = { enable = true; From d1c93fe273fc47084d31cd05ec258568dac92008 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 26 Jan 2026 19:14:31 -0500 Subject: [PATCH 102/232] Fixing noctalia bindings - merge error --- modules/home/hyprland/binds.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index f6a87ca..15d257b 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -10,17 +10,17 @@ noctaliaBind = if barChoice == "noctalia" then [ - "$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" - "$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle" - "$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggleHistory" - "$modifier,V, Noctalia Clipboard, exec, qs -c noctalia-shell ipc call launcher clipboard" - "$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" - "$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle" - "$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend" - "$modifier SHIFT,W, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle" - "$modifier,X, Noctalia Power Menu, exec, qs -c noctalia-shell ipc call sessionMenu toggle" - "$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle" - "$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle" + "$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" + "$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" + "$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory" + "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" + "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" + "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" + "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" + "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" + "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" + "$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle" ] else []; # Rofi launcher bindings (only included when barChoice != "noctalia") From 1af724aba9f86d2356ebee6535e2e624c04813e3 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Mon, 26 Jan 2026 20:21:16 -0500 Subject: [PATCH 103/232] 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 --- flake.lock | 52 ++++++++++++++++----------------- modules/home/hyprland/binds.nix | 14 ++++----- modules/home/noctalia.nix | 31 ++------------------ 3 files changed, 36 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index 695e38a..81c54dc 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1768422311, - "narHash": "sha256-91sJfFjQC999KOkMCGEcfk9GyQ8Ve9MzN27kKsoiORw=", + "lastModified": 1769418838, + "narHash": "sha256-wW6L4fSUi8+JWl5K+tTfF3isZDe3DZKpLsempa2rO0k=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "5a12fae3b38571188abac90452bdb28e3b3a8623", + "rev": "246eaf0563d632e5f0e25034b8e8aac76969cdbc", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1767024057, - "narHash": "sha256-B1aycRjMRvb6QOGbnqDhiDzZwMebj5jxZ5qyJzaKvpI=", + "lastModified": 1768949235, + "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=", "owner": "nix-community", "repo": "home-manager", - "rev": "34578a2fdfce4257ce5f5baf6e7efbd4e4e252b1", + "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767155843, - "narHash": "sha256-pby+ao19K1KQ/Ug8wL5yCcNydhHmnyaFnJZvW1putpU=", + "lastModified": 1769474886, + "narHash": "sha256-Idv5b+XMWjvUTsvJNZU75sMqcb3HA9cUk23XMgmKTso=", "owner": "nixos", "repo": "nixpkgs", - "rev": "129e7faa03027471fe3a92d3bab022434089ab1a", + "rev": "99abc7b4b7dcb382fd12bb115b7dd65c7bf24c83", "type": "github" }, "original": { @@ -456,8 +456,8 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764081664, - "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=", + "lastModified": 1768875095, + "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", "owner": "nixos", "repo": "nixpkgs", "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0", @@ -496,11 +496,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1766849711, - "narHash": "sha256-gtLBwhgjERca1UCzGkFplD5epIVRiNkePHVVtyFr73g=", + "lastModified": 1769049374, + "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", "owner": "nix-community", "repo": "nixvim", - "rev": "cae79c48e93bd61e478dfc12456bf68b1ce66074", + "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", "type": "github" }, "original": { @@ -517,11 +517,11 @@ ] }, "locked": { - "lastModified": 1767140690, - "narHash": "sha256-FemE1tu5FgtlfDD9Vwgk7fA3qg1xsOZKNMapZcB+/LE=", + "lastModified": 1769471305, + "narHash": "sha256-Vw+6B2tVU3U8QEw+cVL4IngOirGFaCMddfbdbyNK4ac=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a3e277ce20dc3401afb7887c089395b0ad0d3108", + "rev": "36ed643e77047df0d024ea9740d20b754c2f9632", "type": "github" }, "original": { @@ -588,11 +588,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1767123832, - "narHash": "sha256-WI+DaMQLJ/QVUKCNk1gvo8y0Rw6C4uDx8BW1mRVVOMU=", + "lastModified": 1769403795, + "narHash": "sha256-Gk1MedUqTOMt9Hnn4WEGK/lpC/6UJ8O+e1Rm3LRnLgI=", "owner": "notashelf", "repo": "nvf", - "rev": "0390abd6736ff34a016afc66366d1f46372f28de", + "rev": "45aaf1cccff9981456821105b4d2b5918f00cab0", "type": "github" }, "original": { @@ -651,11 +651,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769202415, - "narHash": "sha256-6XUTQjam/xLFGeJFj9XCo+12XSxd2iBxkAdLe6IJqiw=", + "lastModified": 1769472288, + "narHash": "sha256-RdnbroWsujYh1MaMhDpP5QM+bRIGG6smz987v1fli+U=", "owner": "danth", "repo": "stylix", - "rev": "296aa01b461af5146612cd26cc115c1d3e5ed4ae", + "rev": "c2c4a3ad52c096db1c8dde97d3d21451613f000c", "type": "github" }, "original": { @@ -829,11 +829,11 @@ ] }, "locked": { - "lastModified": 1769201724, - "narHash": "sha256-jejW3u1bkqz0ObXZeiZqLQNwC7+MXb8/KMwf3VPQpRI=", + "lastModified": 1769296843, + "narHash": "sha256-J2ZqG5LFZkthn/UGn6nGHNW2xFZ0Sn9WhZVBoBIxIiI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0fac05e4b604c3304e7710a95572e78350fe9968", + "rev": "4bee50bdfd104301973e404d7602b1510d549f52", "type": "github" }, "original": { diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 15d257b..145ba5d 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -10,17 +10,17 @@ noctaliaBind = if barChoice == "noctalia" then [ - "$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" + "$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" "$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle" - "$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory" - "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" + "$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory" + "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" - "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" - "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" - "$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle" + "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" + "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" + "$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle" ] else []; # Rofi launcher bindings (only included when barChoice != "noctalia") diff --git a/modules/home/noctalia.nix b/modules/home/noctalia.nix index 945576a..bd98c3c 100644 --- a/modules/home/noctalia.nix +++ b/modules/home/noctalia.nix @@ -3,13 +3,11 @@ inputs, lib, ... -}: -let +}: let system = pkgs.stdenv.hostPlatform.system; noctaliaPkg = inputs.noctalia.packages.${system}.default; configDir = "${noctaliaPkg}/share/noctalia-shell"; -in -{ +in { # Install the Noctalia package home.packages = [ noctaliaPkg @@ -17,7 +15,7 @@ in ]; # Seed the configuration - home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter ["writeBoundary"] '' set -eu DEST="$HOME/.config/quickshell/noctalia-shell" SRC="${configDir}" @@ -28,27 +26,4 @@ in $DRY_RUN_CMD chmod -R u+rwX "$DEST" fi ''; - - # Enable the noctalia-shell systemd user service - systemd.user.services.noctalia-shell = { - Unit = { - Description = "Noctalia Shell - Wayland desktop shell"; - Documentation = "https://docs.noctalia.dev/docs"; - PartOf = ["graphical-session.target"]; - After = ["graphical-session-pre.target"]; - Wants = ["graphical-session-target"]; - }; - Service = { - ExecStart = "${pkgs.quickshell}/bin/quickshell --path %h/.config/quickshell/noctalia-shell"; - Restart = "always"; - RestartSec = 5; - Environment = [ - "QML_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" - "QML2_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml" - ]; - }; - Install = { - WantedBy = ["graphical-session.target"]; - }; - }; } From 3ec7b4cbc54f96b9b2fdbfd1ff8c97afbacfe982 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 26 Jan 2026 20:35:48 -0500 Subject: [PATCH 104/232] Updated CHANGELOG On branch main Your branch is up to date with 'origin/main'. Changes to be committed: modified: CHANGELOG.md --- CHANGELOG.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08ececb..a2f0b6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,20 @@ --- -# 🚀 **Current Release - ZaneyOS v2.5.9** +# 🚀 **Current Release - ZaneyOS v2.6.0** + +#### 📅 **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** From 0862894fa9cf514b1c33e368c2473975b7e2a27f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 26 Jan 2026 20:41:38 -0500 Subject: [PATCH 105/232] 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 --- README.es.md | 8 ++------ README.md | 14 +++++++------- modules/core/system.nix | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/README.es.md b/README.es.md index 3e6e51b..5153115 100644 --- a/README.es.md +++ b/README.es.md @@ -47,7 +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) - #### 🍖 Requisitos - Debes estar ejecutando NixOS, versión 23.11+. @@ -83,8 +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. - - #### 📦 ¿Cómo instalo paquetes? - Puedes buscar en [Nix Packages](https://search.nixos.org/packages?) y @@ -100,7 +97,6 @@ Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración de funcionalidades comenzando el título con [feature request], ¡gracias! - Contáctanos también en [Discord](https://discord.gg/XhZmNTnhtp) para una respuesta potencialmente más rápida. - # Atajos de Hyprland A continuación los atajos de Hyprland, en formato de referencia rápida. La columna de la derecha muestra atajos específicos de **Noctalia Shell** (solo disponibles cuando `barChoice = "noctalia"`). @@ -228,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.5.9/install-zaneyos.sh) +sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh) ``` #### El proceso de instalación se verá así: @@ -259,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.5.9 --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. diff --git a/README.md b/README.md index 13481b3..b11d779 100644 --- a/README.md +++ b/README.md @@ -55,8 +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) - - #### 🍖 Requirements - You must be running on NixOS, version 24.05+. @@ -96,7 +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. - #### 📦 How To Install Packages? - You can search the [Nix Packages](https://search.nixos.org/packages?) & @@ -114,7 +111,6 @@ This includes the wallpaper, scripts, applications, config files, and more. - Contact us on [Discord](https://discord.gg/XhZmNTnhtp) as well, for a potentially faster response. - # Hyprland Keybindings Below are the keybindings for Hyprland, formatted for easy reference. The right @@ -249,7 +245,7 @@ Then: ![ZaneyOS Install Script Command](img/install-script.jpg) ``` -sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/stable-2.5.9/install-zaneyos.sh) +sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh) ``` #### The install process will look something like this: @@ -280,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.5.9 --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. @@ -296,15 +292,18 @@ git add . ``` 4. Edit `hosts//variab -nixos-generate-config --show-hardware-config > hosts//hardware.nix + nixos-generate-config --show-hardware-config > hosts//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 @@ -322,3 +321,4 @@ Thank you for all your assistance - Jerry Starke https://github.com/JerrySM64 ## Hope you enjoy! +``` diff --git a/modules/core/system.nix b/modules/core/system.nix index 81d26b6..850198b 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -29,7 +29,7 @@ in { }; environment.variables = { NIXOS_OZONE_WL = "1"; - ZANEYOS_VERSION = "2.5.9"; + ZANEYOS_VERSION = "2.6.0"; ZANEYOS = "true"; }; console.keyMap = "${consoleKeyMap}"; From a453eb5a8edcc3213da5f52f6c4fef530e0d771f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 26 Jan 2026 20:44:06 -0500 Subject: [PATCH 106/232] 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 --- hosts/nixstation/default.nix | 6 -- hosts/nixstation/hardware.nix | 59 ------------- hosts/nixstation/host-packages.nix | 13 --- hosts/nixstation/variables.nix | 128 ----------------------------- 4 files changed, 206 deletions(-) delete mode 100644 hosts/nixstation/default.nix delete mode 100644 hosts/nixstation/hardware.nix delete mode 100644 hosts/nixstation/host-packages.nix delete mode 100644 hosts/nixstation/variables.nix diff --git a/hosts/nixstation/default.nix b/hosts/nixstation/default.nix deleted file mode 100644 index 6faad47..0000000 --- a/hosts/nixstation/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - imports = [ - ./hardware.nix - ./host-packages.nix - ]; -} diff --git a/hosts/nixstation/hardware.nix b/hosts/nixstation/hardware.nix deleted file mode 100644 index 3339e66..0000000 --- a/hosts/nixstation/hardware.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - config, - lib, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - boot = { - initrd = { - availableKernelModules = [ - "xhci_pci" - "ehci_pci" - "ahci" - "nvme" - "usbhid" - "sd_mod" - ]; - kernelModules = []; - luks.devices = { - "luks-8941ac93-f043-46d1-b128-37d5e846303f".device = "/dev/disk/by-uuid/8941ac93-f043-46d1-b128-37d5e846303f"; - }; - }; - kernelModules = ["kvm-intel"]; - extraModulePackages = []; - }; - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/8bac633b-c4e6-44bc-83b3-97b5472594e8"; - fsType = "ext4"; - }; - "/boot" = { - device = "/dev/disk/by-uuid/BC0C-F843"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - "/home/zaney/BFD" = { - device = "/dev/disk/by-uuid/5A30E2CC30E2AE67"; - fsType = "ntfs"; - options = [ - "defaults" - "umask=000" - "dmask=027" - "fmask=137" - "uid=1000" - "gid=1000" - "windows_names" - ]; - }; - }; - swapDevices = []; - networking.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/nixstation/host-packages.nix b/hosts/nixstation/host-packages.nix deleted file mode 100644 index 60dbba4..0000000 --- a/hosts/nixstation/host-packages.nix +++ /dev/null @@ -1,13 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [ - audacity - discord - nodejs - obs-studio - handbrake - yt-dlp - android-studio - android-studio-tools - android-tools - ]; -} diff --git a/hosts/nixstation/variables.nix b/hosts/nixstation/variables.nix deleted file mode 100644 index d30ffcb..0000000 --- a/hosts/nixstation/variables.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ - # Git Configuration ( For Pulling Software Repos ) - gitUsername = "Tyler Kelly"; - gitEmail = "tylerzanekelly@gmail.com"; - - # Set Displau Manager - # `tui` for Text login - # `sddm` for graphical GUI - # SDDM background is set with stylixImage - displayManager = "sddm"; - - # Emable/disable bundled applications - tmuxEnable = false; - alacrittyEnable = false; - weztermEnable = false; - ghosttyEnable = false; - vscodeEnable = false; - antigravityEnable = false; # Google port of vscodium - helixEnable = false; - #To install rebuild, then run zcli doom install - doomEmacsEnable = false; - - # Python development tools - pythonEnable = false; - - # P10K or starship prompt - userPrompt = "starship"; - - # Hyprland Settings - extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1"; - - # Bar/Shell Settings - # Choose between noctalia or waybar - barChoice = "noctalia"; - - # Waybar Settings (used when barChoice = "waybar") - clock24h = false; - - # Program Options - browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) - - # 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 - # }; - - terminal = "kitty"; # Set Default System Terminal - keyboardLayout = "us"; - consoleKeyMap = "us"; - - # For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA) - intelID = "PCI:1:0:0"; - amdgpuID = "PCI:5:0:0"; - nvidiaID = "PCI:0:2:0"; - - # Enable NFS - enableNFS = true; - - # Enable Printing Support - printEnable = false; - - # Enable Thunar GUI File Manager - thunarEnable = true; - - # Set Stylix Image - # This will set your color palette - # Default background - # Add new images to ~/zaneyos/wallpapers - #stylixImage = ../../wallpapers/mountainscapedark.jpg; - stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; - #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; - #stylixImage = ../../wallpapers/Rainnight.jpg; - #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; - #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg; - #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; - - # Set Waybar - # Available options: - waybarChoice = ../../modules/home/waybar/waybar-curved.nix; - #waybarChoice = ../../modules/home/waybar/waybar-simple.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jerry.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix; - #waybarChoice = ../../modules/home/waybar/waybar-dwm.nix; - #waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix; - #waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix; - #waybarChoice = ../../modules/home/waybar/waybar-tony.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix; - #waybarChoice = ../../modules/home/waybar/waybar-mecha.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix; - #waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix; - - # Set Animation style - # Available options are: - animChoice = ../../modules/home/hyprland/animations-end4.nix; - #animChoice = ../../modules/home/hyprland/animations-def.nix; - #animChoice = ../../modules/home/hyprland/animations-end4-slide.nix; - #animChoice = ../../modules/home/hyprland/animations-end-slide.nix; - #animChoice = ../../modules/home/hyprland/animations-dynamic.nix; - #animChoice = ../../modules/home/hyprland/animations-moving.nix; - #animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix; - #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix; - #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix; - - # Set network hostId if required (needed for zfs) - # Otherwise leave as-is - hostId = "5ab03f50"; -} From dddfeb6ea7d0d96ce7a7829ccb72890df6846612 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 26 Jan 2026 22:31:52 -0500 Subject: [PATCH 107/232] Updated flake On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: flake.lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index c6700e9..e096bad 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1768422311, - "narHash": "sha256-91sJfFjQC999KOkMCGEcfk9GyQ8Ve9MzN27kKsoiORw=", + "lastModified": 1769418838, + "narHash": "sha256-wW6L4fSUi8+JWl5K+tTfF3isZDe3DZKpLsempa2rO0k=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "5a12fae3b38571188abac90452bdb28e3b3a8623", + "rev": "246eaf0563d632e5f0e25034b8e8aac76969cdbc", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769142756, - "narHash": "sha256-BT1QsTPRX96Xxjg26SjN4edIwV7IYXyhY90VwZXmt7E=", + "lastModified": 1769482336, + "narHash": "sha256-fdeDpCSXeznt7VPqsy1pVQKGEQ9dDMgNMSII80hmr2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9bc3b9a66c9e7311975db3c31ca5f334dfb5cc3c", + "rev": "29bd8b199a37fef1b6f15a6bb7c602310ffa106a", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769170682, + "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "c5296fdd05cfa2c187990dd909864da9658df755", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1769145612, - "narHash": "sha256-uHtKorr5FamlD/WXSs7gJYYcsO9EGlVJhY/V4n4HmW4=", + "lastModified": 1769480234, + "narHash": "sha256-ii1N80R6zGSroR1PNNrRKT48H3GMmZMlIl4Kq6EIoCc=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "e4729d9b92346f86eeaccc6063506684575ea9ea", + "rev": "25f939f9c4b2bd8c0aa81833929d7f6df1b3407c", "type": "github" }, "original": { @@ -518,11 +518,11 @@ ] }, "locked": { - "lastModified": 1769111313, - "narHash": "sha256-2IU9TOe7BBG145mftfQW2aYxXxQd2YHfv8V1qTMFkmY=", + "lastModified": 1769403795, + "narHash": "sha256-Gk1MedUqTOMt9Hnn4WEGK/lpC/6UJ8O+e1Rm3LRnLgI=", "owner": "notashelf", "repo": "nvf", - "rev": "bebdddb5719ec2c3f86b0168a785d1a2aee1d857", + "rev": "45aaf1cccff9981456821105b4d2b5918f00cab0", "type": "github" }, "original": { @@ -569,11 +569,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768493544, - "narHash": "sha256-9qk2W/6GJWLAFXNruK/zdJ0bm3bfP50vJFbtuAjQpa4=", + "lastModified": 1769472288, + "narHash": "sha256-RdnbroWsujYh1MaMhDpP5QM+bRIGG6smz987v1fli+U=", "owner": "danth", "repo": "stylix", - "rev": "362306faaa7459bebf8eabf135879785f3da9bd2", + "rev": "c2c4a3ad52c096db1c8dde97d3d21451613f000c", "type": "github" }, "original": { @@ -717,11 +717,11 @@ ] }, "locked": { - "lastModified": 1768847523, - "narHash": "sha256-Rpe8L91vImYuAH5Ct5S0Ua/AVYWEx2iwbSw5/zo0DlE=", + "lastModified": 1769296843, + "narHash": "sha256-J2ZqG5LFZkthn/UGn6nGHNW2xFZ0Sn9WhZVBoBIxIiI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c46511888bcce28b5b54a82cb41d0ef75cd93965", + "rev": "4bee50bdfd104301973e404d7602b1510d549f52", "type": "github" }, "original": { From e3cb8291c5cb76e4c7e354556e24c60d8f8757bd Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 27 Jan 2026 23:05:01 -0500 Subject: [PATCH 108/232] 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 --- modules/home/stylix.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/home/stylix.nix b/modules/home/stylix.nix index 4448304..1624de0 100644 --- a/modules/home/stylix.nix +++ b/modules/home/stylix.nix @@ -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; From dc3b40e0e9fcc8c2b2733fa54804fda15c071dc1 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Wed, 28 Jan 2026 00:02:57 -0500 Subject: [PATCH 109/232] Updated CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2f0b6b..0faa871 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ # 🚀 **Current Release - ZaneyOS v2.6.0** +#### 📅 **Updated: January 28th, 2026** + +- Disabled gnome in stylix. Caused install failure + #### 📅 **Updated: January 26th, 2026** - `noctalia-shell` regression: From 1f55d99d333d727e8f45748e966072211a68801b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 31 Jan 2026 19:32:44 -0500 Subject: [PATCH 110/232] 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 --- hosts/default/variables.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index c44ab35..aff6cc0 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -7,7 +7,7 @@ # `tui` for Text login # `sddm` for graphical GUI (default) # SDDM background is set with stylixImage - displayManager = "sddm"; + displayManager = "tui"; # Emable/disable bundled applications tmuxEnable = false; From e2bd8d74cbd71b4a85a5d6aed7f8b480e15b432f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 31 Jan 2026 19:38:40 -0500 Subject: [PATCH 111/232] Updated CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0faa871..e65775a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ # 🚀 **Current Release - ZaneyOS v2.6.0** +#### 📅 **Updated: January 31st, 2026** + +- Changed default login manager to `TUI` + - Issues recently (again) with SDDM and some GPUs + - Often related to SDDM wayland support option + - Some GPUs need it enabled, others disabled + #### 📅 **Updated: January 28th, 2026** - Disabled gnome in stylix. Caused install failure From 6583ee73ab058ae85dcad61b14766de270350ba5 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Sat, 31 Jan 2026 20:11:44 -0500 Subject: [PATCH 112/232] 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 --- flake.lock | 44 +++++++++--------- modules/home/hyprland/binds.nix | 3 +- modules/home/scripts/default.nix | 1 + modules/home/scripts/restart.noctalia | 54 +++++++++++++++++++++++ modules/home/scripts/restart.noctalia.nix | 24 ++++++++++ 5 files changed, 103 insertions(+), 23 deletions(-) create mode 100644 modules/home/scripts/restart.noctalia create mode 100644 modules/home/scripts/restart.noctalia.nix diff --git a/flake.lock b/flake.lock index 81c54dc..77f7aa7 100644 --- a/flake.lock +++ b/flake.lock @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1768949235, - "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=", + "lastModified": 1769580047, + "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=", "owner": "nix-community", "repo": "home-manager", - "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5", + "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769474886, - "narHash": "sha256-Idv5b+XMWjvUTsvJNZU75sMqcb3HA9cUk23XMgmKTso=", + "lastModified": 1769900590, + "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "99abc7b4b7dcb382fd12bb115b7dd65c7bf24c83", + "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", "type": "github" }, "original": { @@ -456,16 +456,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1768875095, - "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -517,11 +517,11 @@ ] }, "locked": { - "lastModified": 1769471305, - "narHash": "sha256-Vw+6B2tVU3U8QEw+cVL4IngOirGFaCMddfbdbyNK4ac=", + "lastModified": 1769900893, + "narHash": "sha256-lhH1TeBRXDNvCZKNzEfqiONLHo4UoLl9hHhro52Bo9E=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "36ed643e77047df0d024ea9740d20b754c2f9632", + "rev": "834bbd119b6f7ba88df960855dcf8ceb0f698892", "type": "github" }, "original": { @@ -588,11 +588,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1769403795, - "narHash": "sha256-Gk1MedUqTOMt9Hnn4WEGK/lpC/6UJ8O+e1Rm3LRnLgI=", + "lastModified": 1769786801, + "narHash": "sha256-i5130O0JEAgZZ/d3mksGbXriNPZiXrvDOh9JWMQZh3w=", "owner": "notashelf", "repo": "nvf", - "rev": "45aaf1cccff9981456821105b4d2b5918f00cab0", + "rev": "fde1338793aeb88810122030cf0badd3297936b0", "type": "github" }, "original": { @@ -651,11 +651,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769472288, - "narHash": "sha256-RdnbroWsujYh1MaMhDpP5QM+bRIGG6smz987v1fli+U=", + "lastModified": 1769885983, + "narHash": "sha256-jLS7410B58f+3WfZ4PQ28aaaTONnmxlfAbDPdNuciLc=", "owner": "danth", "repo": "stylix", - "rev": "c2c4a3ad52c096db1c8dde97d3d21451613f000c", + "rev": "fe06391a1e1905fc7e6c13443ea439a89695ca69", "type": "github" }, "original": { @@ -829,11 +829,11 @@ ] }, "locked": { - "lastModified": 1769296843, - "narHash": "sha256-J2ZqG5LFZkthn/UGn6nGHNW2xFZ0Sn9WhZVBoBIxIiI=", + "lastModified": 1769738723, + "narHash": "sha256-ioCEdVwy0nlOafPZQjbS1ogwdpujaFF7dv58ULo8auI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4bee50bdfd104301973e404d7602b1510d549f52", + "rev": "9673f8049ccd8b73c8a7df2806f769081849315e", "type": "github" }, "original": { diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 145ba5d..a245cc1 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -21,6 +21,7 @@ "$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") @@ -53,7 +54,7 @@ in { # ============= APPLICATION LAUNCHERS ============= "$modifier,K, Keybinds Search Tool, exec, qs-keybinds" "$modifier CTRL,C, Cheatsheets Viewer, exec, qs-cheatsheets" - "$modifier SHIFT,K, Legacy Keybinds Menu, exec, list-keybinds" + "$modifier SHIFT,K, Keybinds Search Tool, exec, qs-keybinds" "$modifier SHIFT,D, Discord, exec, discord" "$modifier ALT,W, Web Search, exec, web-search" "$modifier SHIFT,W, QS Wallpaper Setter, exec, qs-wallpapers-apply" diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 69c0598..94f1355 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -38,6 +38,7 @@ (import ./docs-parser.nix {inherit pkgs;}) (import ./launch-nwg-menu.nix {inherit pkgs;}) (import ./hyprland-dock.nix {inherit pkgs;}) + (import ./restart.noctalia.nix {inherit pkgs;}) (import ./zcli.nix { inherit pkgs profile; backupFiles = [ diff --git a/modules/home/scripts/restart.noctalia b/modules/home/scripts/restart.noctalia new file mode 100644 index 0000000..747c18a --- /dev/null +++ b/modules/home/scripts/restart.noctalia @@ -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 diff --git a/modules/home/scripts/restart.noctalia.nix b/modules/home/scripts/restart.noctalia.nix new file mode 100644 index 0000000..d229149 --- /dev/null +++ b/modules/home/scripts/restart.noctalia.nix @@ -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" "$@" + '' From 127ff7cf1ef5b104a51c0d6f7fdfa7c0700feed1 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Sun, 8 Feb 2026 14:20:43 -0500 Subject: [PATCH 113/232] Updated flake --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 77f7aa7..b778408 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1769418838, - "narHash": "sha256-wW6L4fSUi8+JWl5K+tTfF3isZDe3DZKpLsempa2rO0k=", + "lastModified": 1770196631, + "narHash": "sha256-neRXwIILc8BUFHeT0UM2Mj8Wt1oo4UPpmm4NkfBwQOY=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "246eaf0563d632e5f0e25034b8e8aac76969cdbc", + "rev": "acc9baf089a67ef7456117ef31285e34c3294984", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1769580047, - "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=", + "lastModified": 1770260404, + "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "owner": "nix-community", "repo": "home-manager", - "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826", + "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1768434960, - "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", + "lastModified": 1769872935, + "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", + "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", "type": "github" }, "original": { @@ -387,11 +387,11 @@ }, "mnw": { "locked": { - "lastModified": 1768701608, - "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=", + "lastModified": 1769981889, + "narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=", "owner": "Gerg-L", "repo": "mnw", - "rev": "20d63a8a1ae400557c770052a46a9840e768926b", + "rev": "332fed8f43b77149c582f1782683d6aeee1f07cf", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769900590, - "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", + "lastModified": 1770573497, + "narHash": "sha256-pzb4PNz3Ke2PtgK0wLFTgzRJkcE7ICHVIgbgiK5ALfI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", + "rev": "17b3e84e1a0997797f0c33fbee42ea273deaf56f", "type": "github" }, "original": { @@ -517,11 +517,11 @@ ] }, "locked": { - "lastModified": 1769900893, - "narHash": "sha256-lhH1TeBRXDNvCZKNzEfqiONLHo4UoLl9hHhro52Bo9E=", + "lastModified": 1770571663, + "narHash": "sha256-Vqd5senFyozLb7EM7JvScUqC56eQFfSo+xvGFuEVn+8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "834bbd119b6f7ba88df960855dcf8ceb0f698892", + "rev": "f9f668dbe64396100d6a8d89618737d3503d013a", "type": "github" }, "original": { @@ -588,11 +588,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1769786801, - "narHash": "sha256-i5130O0JEAgZZ/d3mksGbXriNPZiXrvDOh9JWMQZh3w=", + "lastModified": 1770572967, + "narHash": "sha256-uQ4g+gypEXoNE6bgQq1UP3mrwUNuemhdD3A7G9tbchk=", "owner": "notashelf", "repo": "nvf", - "rev": "fde1338793aeb88810122030cf0badd3297936b0", + "rev": "7a2c7c23966122eac80620dd503bf2b1163ed6d4", "type": "github" }, "original": { @@ -651,11 +651,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769885983, - "narHash": "sha256-jLS7410B58f+3WfZ4PQ28aaaTONnmxlfAbDPdNuciLc=", + "lastModified": 1770308890, + "narHash": "sha256-7bx8Bn9B2g/loBaz+uLwdKI2rUW+RhDPyP/MqAgvrxU=", "owner": "danth", "repo": "stylix", - "rev": "fe06391a1e1905fc7e6c13443ea439a89695ca69", + "rev": "7e7fa955abac04a8e118b1cedf930a8fd41c34a6", "type": "github" }, "original": { @@ -829,11 +829,11 @@ ] }, "locked": { - "lastModified": 1769738723, - "narHash": "sha256-ioCEdVwy0nlOafPZQjbS1ogwdpujaFF7dv58ULo8auI=", + "lastModified": 1770416716, + "narHash": "sha256-80KR/xJfP9F95IMMXjJc8q+N/UP40TLb0OoAGktRmTE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9673f8049ccd8b73c8a7df2806f769081849315e", + "rev": "9616286ab63464a302b7879aaf37173d4047cb74", "type": "github" }, "original": { From d44f5e6a6fdd7cf3faed65602ad60c576d99fffa Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 8 Feb 2026 14:21:23 -0500 Subject: [PATCH 114/232] Updated flake --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index e096bad..bae6aeb 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1769418838, - "narHash": "sha256-wW6L4fSUi8+JWl5K+tTfF3isZDe3DZKpLsempa2rO0k=", + "lastModified": 1770196631, + "narHash": "sha256-neRXwIILc8BUFHeT0UM2Mj8Wt1oo4UPpmm4NkfBwQOY=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "246eaf0563d632e5f0e25034b8e8aac76969cdbc", + "rev": "acc9baf089a67ef7456117ef31285e34c3294984", "type": "github" }, "original": { @@ -262,11 +262,11 @@ ] }, "locked": { - "lastModified": 1768949235, - "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=", + "lastModified": 1770260404, + "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "owner": "nix-community", "repo": "home-manager", - "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5", + "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "type": "github" }, "original": { @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1768434960, - "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", + "lastModified": 1769872935, + "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", + "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", "type": "github" }, "original": { @@ -327,11 +327,11 @@ }, "mnw": { "locked": { - "lastModified": 1768701608, - "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=", + "lastModified": 1769981889, + "narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=", "owner": "Gerg-L", "repo": "mnw", - "rev": "20d63a8a1ae400557c770052a46a9840e768926b", + "rev": "332fed8f43b77149c582f1782683d6aeee1f07cf", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769482336, - "narHash": "sha256-fdeDpCSXeznt7VPqsy1pVQKGEQ9dDMgNMSII80hmr2Y=", + "lastModified": 1770573497, + "narHash": "sha256-pzb4PNz3Ke2PtgK0wLFTgzRJkcE7ICHVIgbgiK5ALfI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "29bd8b199a37fef1b6f15a6bb7c602310ffa106a", + "rev": "17b3e84e1a0997797f0c33fbee42ea273deaf56f", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1769170682, - "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5296fdd05cfa2c187990dd909864da9658df755", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1769480234, - "narHash": "sha256-ii1N80R6zGSroR1PNNrRKT48H3GMmZMlIl4Kq6EIoCc=", + "lastModified": 1770571663, + "narHash": "sha256-Vqd5senFyozLb7EM7JvScUqC56eQFfSo+xvGFuEVn+8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "25f939f9c4b2bd8c0aa81833929d7f6df1b3407c", + "rev": "f9f668dbe64396100d6a8d89618737d3503d013a", "type": "github" }, "original": { @@ -518,11 +518,11 @@ ] }, "locked": { - "lastModified": 1769403795, - "narHash": "sha256-Gk1MedUqTOMt9Hnn4WEGK/lpC/6UJ8O+e1Rm3LRnLgI=", + "lastModified": 1770572967, + "narHash": "sha256-uQ4g+gypEXoNE6bgQq1UP3mrwUNuemhdD3A7G9tbchk=", "owner": "notashelf", "repo": "nvf", - "rev": "45aaf1cccff9981456821105b4d2b5918f00cab0", + "rev": "7a2c7c23966122eac80620dd503bf2b1163ed6d4", "type": "github" }, "original": { @@ -569,11 +569,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769472288, - "narHash": "sha256-RdnbroWsujYh1MaMhDpP5QM+bRIGG6smz987v1fli+U=", + "lastModified": 1770308890, + "narHash": "sha256-7bx8Bn9B2g/loBaz+uLwdKI2rUW+RhDPyP/MqAgvrxU=", "owner": "danth", "repo": "stylix", - "rev": "c2c4a3ad52c096db1c8dde97d3d21451613f000c", + "rev": "7e7fa955abac04a8e118b1cedf930a8fd41c34a6", "type": "github" }, "original": { @@ -717,11 +717,11 @@ ] }, "locked": { - "lastModified": 1769296843, - "narHash": "sha256-J2ZqG5LFZkthn/UGn6nGHNW2xFZ0Sn9WhZVBoBIxIiI=", + "lastModified": 1770416716, + "narHash": "sha256-80KR/xJfP9F95IMMXjJc8q+N/UP40TLb0OoAGktRmTE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4bee50bdfd104301973e404d7602b1510d549f52", + "rev": "9616286ab63464a302b7879aaf37173d4047cb74", "type": "github" }, "original": { From d54f3c37bf61d973581ced1b953c067fccfddb88 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 9 Feb 2026 19:06:34 -0500 Subject: [PATCH 115/232] Added check for python3 to install script I added a python script to better handle editing config files On branch zos-next Your branch is behind 'origin/zos-next' by 2 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes to be committed: modified: install-zaneyos.sh modified: modules/home/install-zaneyos.sh --- install-zaneyos.sh | 8 ++++++++ modules/home/install-zaneyos.sh | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index b691faf..84bfe70 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -90,6 +90,14 @@ if ! command -v lspci &>/dev/null; then exit 1 fi +# Check for python3 (required for helper scripts) +if ! command -v python3 &>/dev/null; then + print_error "python3 is not installed." + echo -e "Please install python3, then re-run the install script." + echo -e "Example: nix-shell -p python3" + exit 1 +fi + if [ -n "$(grep -i nixos /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 From ce02cc2ead99506a85814f2fe383e6f0ca6041db Mon Sep 17 00:00:00 2001 From: Jesse Stoltz Date: Fri, 13 Feb 2026 18:30:30 +0000 Subject: [PATCH 116/232] 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 --- hosts/default/host-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hosts/default/host-packages.nix b/hosts/default/host-packages.nix index f44b200..d8e31db 100644 --- a/hosts/default/host-packages.nix +++ b/hosts/default/host-packages.nix @@ -1,7 +1,15 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ environment.systemPackages = with pkgs; [ audacity discord nodejs ]; + services = { + flatpak = { + packages = [ + + ]; + }; + }; } From bc3c7b8e7431dd3b747f2b69c38d8d8f070e64b6 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 22:00:26 -0500 Subject: [PATCH 117/232] Added overlay for tumbler disable EPUB causes webkitgtk to builld source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only thumbnails for EPUB files are impacted /nix/store/fn300dz18wisc4nkbhmhgs2mnxd1yj91-nixos-system-zaneyos-next-25.11.20260208.17b3e84 └───/nix/store/wb79p57khq59qxy5902dggldh93hjicp-system-path └───/nix/store/adaiszkbn3p7x0m2m11dziaam2gp82kn-tumbler-4.20.1 └───/nix/store/wylxx7axqwzf7miy4g30m3g6j959328k-libgepub-0.7.3 └───/nix/store/4i6mqkahm On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/core/overlays.nix --- modules/core/overlays.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index 1b18c86..94991f6 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -10,5 +10,14 @@ config.allowUnfree = true; }; }) + + # Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk + (_final: prev: { + xfce = prev.xfce // { + tumbler = prev.xfce.tumbler.overrideAttrs (old: { + buildInputs = prev.lib.remove prev.libgepub old.buildInputs; + }); + }; + }) ]; } From 3a7a54c2080ec12405100fc0d0db6c08627ceb68 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 22:10:12 -0500 Subject: [PATCH 118/232] 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 --- hosts/default/host-packages.nix | 9 +++------ hosts/zaneyos-24-vm/host-packages.nix | 3 --- hosts/zaneyos-oem/host-packages.nix | 2 -- modules/core/overlays.nix | 9 +++++++++ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hosts/default/host-packages.nix b/hosts/default/host-packages.nix index d8e31db..0febf63 100644 --- a/hosts/default/host-packages.nix +++ b/hosts/default/host-packages.nix @@ -1,14 +1,11 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { environment.systemPackages = with pkgs; [ - audacity - discord - nodejs + # Add local pacakaged here ]; + # Add host specific flatpaks here services = { flatpak = { packages = [ - ]; }; }; diff --git a/hosts/zaneyos-24-vm/host-packages.nix b/hosts/zaneyos-24-vm/host-packages.nix index f44b200..33b6047 100644 --- a/hosts/zaneyos-24-vm/host-packages.nix +++ b/hosts/zaneyos-24-vm/host-packages.nix @@ -1,7 +1,4 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ - audacity - discord - nodejs ]; } diff --git a/hosts/zaneyos-oem/host-packages.nix b/hosts/zaneyos-oem/host-packages.nix index 37a6b3b..d1a5eb3 100644 --- a/hosts/zaneyos-oem/host-packages.nix +++ b/hosts/zaneyos-oem/host-packages.nix @@ -1,12 +1,10 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ - nodejs atop bottom dua fd gping - lunarvim luarocks mission-center resources diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index c7de92a..f2d25f9 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -2,5 +2,14 @@ nixpkgs.overlays = [ # Provide pkgs.google-antigravity via antigravity-nix overlay inputs.antigravity-nix.overlays.default + + # Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk + (_final: prev: { + xfce = prev.xfce // { + tumbler = prev.xfce.tumbler.overrideAttrs (old: { + buildInputs = prev.lib.remove prev.libgepub old.buildInputs; + }); + }; + }) ]; } From 9a2f5693651b7199020dafe6bd874de7506f0bb8 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 22:19:40 -0500 Subject: [PATCH 119/232] Removed audactity made overlay to disble libepub audactity and tumbler libepub causing webgitkit to build from source which takes hours on every rebuild On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: ../flake.lock modified: default/host-packages.nix deleted: nixstation/default.nix deleted: nixstation/hardware.nix deleted: nixstation/host-packages.nix deleted: nixstation/variables.nix modified: zaneyos-24-vm/host-packages.nix modified: zaneyos-next/host-packages.nix modified: zaneyos-oem/host-packages.nix --- flake.lock | 54 +++++----- hosts/default/host-packages.nix | 2 - hosts/nixstation/default.nix | 7 -- hosts/nixstation/hardware.nix | 59 ----------- hosts/nixstation/host-packages.nix | 13 --- hosts/nixstation/variables.nix | 138 -------------------------- hosts/zaneyos-24-vm/host-packages.nix | 3 - hosts/zaneyos-next/host-packages.nix | 3 - hosts/zaneyos-oem/host-packages.nix | 2 - 9 files changed, 27 insertions(+), 254 deletions(-) delete mode 100644 hosts/nixstation/default.nix delete mode 100644 hosts/nixstation/hardware.nix delete mode 100644 hosts/nixstation/host-packages.nix delete mode 100644 hosts/nixstation/variables.nix diff --git a/flake.lock b/flake.lock index bae6aeb..0e01fdd 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1770196631, - "narHash": "sha256-neRXwIILc8BUFHeT0UM2Mj8Wt1oo4UPpmm4NkfBwQOY=", + "lastModified": 1771198383, + "narHash": "sha256-mOq7ks7gdWyVStIUAp7U8wztanYKt0GgCnIZtPUJ6n8=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "acc9baf089a67ef7456117ef31285e34c3294984", + "rev": "703d29149cc127d1ec7c1885ff14f85d4e6a01ce", "type": "github" }, "original": { @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1769872935, - "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", + "lastModified": 1771102945, + "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", + "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399", "type": "github" }, "original": { @@ -327,11 +327,11 @@ }, "mnw": { "locked": { - "lastModified": 1769981889, - "narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=", + "lastModified": 1770419553, + "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", "owner": "Gerg-L", "repo": "mnw", - "rev": "332fed8f43b77149c582f1782683d6aeee1f07cf", + "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770573497, - "narHash": "sha256-pzb4PNz3Ke2PtgK0wLFTgzRJkcE7ICHVIgbgiK5ALfI=", + "lastModified": 1771294474, + "narHash": "sha256-DbvnUIjLYVKGxkT33XF6y0Zz0TDk1plcloMQ0IeiHB8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "17b3e84e1a0997797f0c33fbee42ea273deaf56f", + "rev": "80cd9310019145aa23379b1395381d056cc7ac18", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1770571663, - "narHash": "sha256-Vqd5senFyozLb7EM7JvScUqC56eQFfSo+xvGFuEVn+8=", + "lastModified": 1771269759, + "narHash": "sha256-OcSMUdOxKeCCNV+gOgZWP+BOGedi3QxxGNIbQQQsEFk=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "f9f668dbe64396100d6a8d89618737d3503d013a", + "rev": "c33db6b999a884000e33ec2d018ef9de394bf42a", "type": "github" }, "original": { @@ -518,11 +518,11 @@ ] }, "locked": { - "lastModified": 1770572967, - "narHash": "sha256-uQ4g+gypEXoNE6bgQq1UP3mrwUNuemhdD3A7G9tbchk=", + "lastModified": 1771274219, + "narHash": "sha256-n7CZAK+mTko+y3SSwvFt49AD1RNLY2KcHypcoly8HVc=", "owner": "notashelf", "repo": "nvf", - "rev": "7a2c7c23966122eac80620dd503bf2b1163ed6d4", + "rev": "99bf160aaef28d47f1818deffe662ce1c4d6e6a1", "type": "github" }, "original": { @@ -717,11 +717,11 @@ ] }, "locked": { - "lastModified": 1770416716, - "narHash": "sha256-80KR/xJfP9F95IMMXjJc8q+N/UP40TLb0OoAGktRmTE=", + "lastModified": 1771247135, + "narHash": "sha256-qDFOVzhs8S/dk3Eqvyqi7veWKEviZuh0hjTNsb4TZ2I=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9616286ab63464a302b7879aaf37173d4047cb74", + "rev": "a96ac9e2ae07ccd8522a790ff720db11dd3bdd6e", "type": "github" }, "original": { diff --git a/hosts/default/host-packages.nix b/hosts/default/host-packages.nix index 76193ba..33b6047 100644 --- a/hosts/default/host-packages.nix +++ b/hosts/default/host-packages.nix @@ -1,6 +1,4 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ - audacity - nodejs ]; } diff --git a/hosts/nixstation/default.nix b/hosts/nixstation/default.nix deleted file mode 100644 index bdd5f44..0000000 --- a/hosts/nixstation/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - imports = [ - ./hardware.nix - ./host-packages.nix - ./variables.nix - ]; -} diff --git a/hosts/nixstation/hardware.nix b/hosts/nixstation/hardware.nix deleted file mode 100644 index 3339e66..0000000 --- a/hosts/nixstation/hardware.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - config, - lib, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - boot = { - initrd = { - availableKernelModules = [ - "xhci_pci" - "ehci_pci" - "ahci" - "nvme" - "usbhid" - "sd_mod" - ]; - kernelModules = []; - luks.devices = { - "luks-8941ac93-f043-46d1-b128-37d5e846303f".device = "/dev/disk/by-uuid/8941ac93-f043-46d1-b128-37d5e846303f"; - }; - }; - kernelModules = ["kvm-intel"]; - extraModulePackages = []; - }; - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/8bac633b-c4e6-44bc-83b3-97b5472594e8"; - fsType = "ext4"; - }; - "/boot" = { - device = "/dev/disk/by-uuid/BC0C-F843"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - "/home/zaney/BFD" = { - device = "/dev/disk/by-uuid/5A30E2CC30E2AE67"; - fsType = "ntfs"; - options = [ - "defaults" - "umask=000" - "dmask=027" - "fmask=137" - "uid=1000" - "gid=1000" - "windows_names" - ]; - }; - }; - swapDevices = []; - networking.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/nixstation/host-packages.nix b/hosts/nixstation/host-packages.nix deleted file mode 100644 index 60dbba4..0000000 --- a/hosts/nixstation/host-packages.nix +++ /dev/null @@ -1,13 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [ - audacity - discord - nodejs - obs-studio - handbrake - yt-dlp - android-studio - android-studio-tools - android-tools - ]; -} diff --git a/hosts/nixstation/variables.nix b/hosts/nixstation/variables.nix deleted file mode 100644 index e6e47e3..0000000 --- a/hosts/nixstation/variables.nix +++ /dev/null @@ -1,138 +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 ( For Pulling Software Repos ) - gitUsername = "Tyler Kelly"; - gitEmail = "tylerzanekelly@gmail.com"; - - gpuProfile = "vm"; - - # Set Displau Manager - # `tui` for Text login - # `sddm` for graphical GUI - # SDDM background is set with stylixImage - displayManager = "sddm"; - - # Emable/disable bundled applications - tmuxEnable = false; - alacrittyEnable = false; - weztermEnable = false; - ghosttyEnable = false; - vscodeEnable = false; - antigravityEnable = false; # Google port of vscodium - helixEnable = false; - #To install rebuild, then run zcli doom install - doomEmacsEnable = false; - - # Hyprland Settings - extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1"; - - # Bar/Shell Settings - # Choose between noctalia or waybar - barChoice = "noctalia"; - - # Waybar Settings (used when barChoice = "waybar") - clock24h = false; - - # Program Options - browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) - - # 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"; - consoleKeyMap = "us"; - - # For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA) - intelID = "PCI:1:0:0"; - amdgpuID = "PCI:5:0:0"; - nvidiaID = "PCI:0:2:0"; - - # Enable NFS - enableNFS = true; - - # Enable Printing Support - printEnable = false; - - # Enable Thunar GUI File Manager - thunarEnable = true; - - # Set Stylix Image - # This will set your color palette - # Default background - # Add new images to ~/zaneyos/wallpapers - #stylixImage = ../../wallpapers/mountainscapedark.jpg; - stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; - #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; - #stylixImage = ../../wallpapers/Rainnight.jpg; - #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; - #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg; - #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; - - # Set Waybar - # Available options: - waybarChoice = ../../modules/home/waybar/waybar-curved.nix; - #waybarChoice = ../../modules/home/waybar/waybar-simple.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jerry.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix; - #waybarChoice = ../../modules/home/waybar/waybar-dwm.nix; - #waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix; - #waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix; - #waybarChoice = ../../modules/home/waybar/waybar-tony.nix; - #waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix; - #waybarChoice = ../../modules/home/waybar/waybar-mecha.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix; - #waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix; - #waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix; - #waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix; - - # Set Animation style - # Available options are: - animChoice = ../../modules/home/hyprland/animations-end4.nix; - #animChoice = ../../modules/home/hyprland/animations-def.nix; - #animChoice = ../../modules/home/hyprland/animations-end4-slide.nix; - #animChoice = ../../modules/home/hyprland/animations-end-slide.nix; - #animChoice = ../../modules/home/hyprland/animations-dynamic.nix; - #animChoice = ../../modules/home/hyprland/animations-moving.nix; - #animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix; - #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix; - #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix; - #animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix; - - # Set network hostId if required (needed for zfs) - # Otherwise leave as-is - hostId = "5ab03f50"; - }; -} diff --git a/hosts/zaneyos-24-vm/host-packages.nix b/hosts/zaneyos-24-vm/host-packages.nix index f44b200..33b6047 100644 --- a/hosts/zaneyos-24-vm/host-packages.nix +++ b/hosts/zaneyos-24-vm/host-packages.nix @@ -1,7 +1,4 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ - audacity - discord - nodejs ]; } diff --git a/hosts/zaneyos-next/host-packages.nix b/hosts/zaneyos-next/host-packages.nix index f44b200..33b6047 100644 --- a/hosts/zaneyos-next/host-packages.nix +++ b/hosts/zaneyos-next/host-packages.nix @@ -1,7 +1,4 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ - audacity - discord - nodejs ]; } diff --git a/hosts/zaneyos-oem/host-packages.nix b/hosts/zaneyos-oem/host-packages.nix index 37a6b3b..d1a5eb3 100644 --- a/hosts/zaneyos-oem/host-packages.nix +++ b/hosts/zaneyos-oem/host-packages.nix @@ -1,12 +1,10 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ - nodejs atop bottom dua fd gping - lunarvim luarocks mission-center resources From e73671b09b60ebf52344c59dd891b09a3ae0b0af Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 22:30:15 -0500 Subject: [PATCH 120/232] Removed hyprpanel feature. Not being updated noctalia replaced it On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: modules/home/scripts/docs-parser.nix modified: modules/home/scripts/qs-docs.nix modified: modules/home/scripts/qs-panels.nix modified: modules/home/scripts/qs-wallpapers-restore.nix --- modules/home/scripts/docs-parser.nix | 2 +- modules/home/scripts/qs-docs.nix | 4 ++-- modules/home/scripts/qs-panels.nix | 5 +---- modules/home/scripts/qs-wallpapers-restore.nix | 13 ------------- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/modules/home/scripts/docs-parser.nix b/modules/home/scripts/docs-parser.nix index 884f9e7..1276bea 100644 --- a/modules/home/scripts/docs-parser.nix +++ b/modules/home/scripts/docs-parser.nix @@ -16,7 +16,7 @@ pkgs.writeShellScriptBin "docs-parser" '' Usage: docs-parser [MODE] [CATEGORY] [LANGUAGE] MODE: files|content - CATEGORY: AI|Hyprpanel|Zed|ddubsos|etc. + CATEGORY: AI|Zed|ddubsos|etc. LANGUAGE: en|es Examples: diff --git a/modules/home/scripts/qs-docs.nix b/modules/home/scripts/qs-docs.nix index 0edeb40..b5dfc82 100644 --- a/modules/home/scripts/qs-docs.nix +++ b/modules/home/scripts/qs-docs.nix @@ -12,7 +12,7 @@ pkgs.writeShellScriptBin "qs-docs" '' Usage: qs-docs [options] Options: - -c CATEGORY Category to display (AI|Hyprpanel|Zed|ddubsos) (default: AI) + -c CATEGORY Category to display (AI|Zed|ddubsos) (default: AI) -l LANGUAGE Language (en|es) (default: en) -h Show this help EOF @@ -316,7 +316,7 @@ pkgs.writeShellScriptBin "qs-docs" '' win.availableCategories = result; } catch (e) { console.error("Failed to parse categories JSON:", e); - win.availableCategories = ["AI", "Hyprpanel", "Zed", "ddubsos"]; + win.availableCategories = ["AI", "Zed", "ddubsos"]; } } } diff --git a/modules/home/scripts/qs-panels.nix b/modules/home/scripts/qs-panels.nix index 500e070..2f0f97c 100644 --- a/modules/home/scripts/qs-panels.nix +++ b/modules/home/scripts/qs-panels.nix @@ -5,7 +5,6 @@ pkgs.writeShellScriptBin "qs-panels" '' # Detect current active panel/bar (robust matching, no regex metachar) active="" - if pgrep -x hyprpanel >/dev/null 2>&1; then active="hyprpanel"; fi if pgrep -x waybar >/dev/null 2>&1; then active="waybar"; fi if pgrep -x dms >/dev/null 2>&1 || pgrep -fa dms | grep -q "\bdms\b.*\brun\b"; then active="dms"; fi if pgrep -fa quickshell | grep -q "noctalia-shell"; then active="noctalia"; fi @@ -66,8 +65,7 @@ pkgs.writeShellScriptBin "qs-panels" '' model: [ { key: "noctalia", label: "Noctalia" }, { key: "dms", label: "DMS" }, - { key: "waybar", label: "Waybar" }, - { key: "hyprpanel",label: "Hyprpanel" } + { key: "waybar", label: "Waybar" } ] delegate: Rectangle { width: 180; height: 52 @@ -149,7 +147,6 @@ pkgs.writeShellScriptBin "qs-panels" '' noctalia) run_and_exit noctalia-run ;; dms) run_and_exit dms-run ;; waybar) run_and_exit waybar-run ;; - hyprpanel)run_and_exit hyprpanel-run ;; *) exit 0 ;; esac '' diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix index 9616939..fdece87 100644 --- a/modules/home/scripts/qs-wallpapers-restore.nix +++ b/modules/home/scripts/qs-wallpapers-restore.nix @@ -51,19 +51,6 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' } start_swww() { - # Honor Hyprpanel requirement: do not start swww-daemon before Hyprpanel - local wait_sec="''${QS_RESTORE_WAIT_HYPRPANEL_SECONDS:-15}" - if ${pkgs.procps}/bin/pgrep -x hyprpanel >/dev/null 2>&1; then - log "hyprpanel detected; proceeding" - else - # If waybar is already running, it's fine to proceed immediately - if ${pkgs.procps}/bin/pgrep -x waybar >/dev/null 2>&1; then - log "waybar detected; proceeding without waiting for hyprpanel" - else - log "Waiting up to ''${wait_sec}s for hyprpanel before starting swww-daemon" - wait_for_proc hyprpanel "$wait_sec" || log "hyprpanel not detected after ''${wait_sec}s; proceeding" - fi - fi # Stop conflicting daemons if we intend to use swww ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true From 16f8835012bd4ac30b0b2d26b67a3ecad15df0e2 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 22:35:45 -0500 Subject: [PATCH 121/232] Updted CHANGELOG removing hyprpanel and webkitgtk On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: CHANGELOG.md --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62ccebb..78211af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,18 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** +#### 📅 **Updated: February 16th, 2026** + +- `webkitgtk` being built from source + - Removed audacity is called `wxwidgets` + - Created overlay for `tumbler` to disable `libepub` + - These caused the build from source issue + - Building `webkitgtk` takes hours every rebuild/update +- Removed `hyprpanel` + - Not being maintained + - Vendor is building it's replacement `wayle` + - It's been replaced by `noctalia-shell` + #### 📅 **Updated: January 6th, 2026** - Disabled `noctalia-shell` service From 6dc70452ef9aae7f3903a810eb7a5a47e9a6be2f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 22:39:42 -0500 Subject: [PATCH 122/232] 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 --- CHANGELOG.md | 15 +++++++++++++++ modules/home/scripts/docs-parser.nix | 2 +- modules/home/scripts/qs-docs.nix | 4 ++-- modules/home/scripts/qs-panels.nix | 5 +---- modules/home/scripts/qs-wallpapers-restore.nix | 13 ------------- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e65775a..7df6c0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,21 @@ # 🚀 **Current Release - ZaneyOS v2.6.0** +\ + +#### 📅 **Updated: February 16th, 2026** + +- Removed `hyprpanel` + - No longer maintained + - Vendor created `wayle` to replace it + - Replaced in ZaneyOS with 'noctalia-shell' + +- `webkitgtk` being built from source + - Removed audacity is called `wxwidgets` + - Created overlay for `tumbler` to disable `libepub` + - These caused the build from source issue + - Building `webkitgtk` takes hours every rebuild/update + #### 📅 **Updated: January 31st, 2026** - Changed default login manager to `TUI` diff --git a/modules/home/scripts/docs-parser.nix b/modules/home/scripts/docs-parser.nix index 884f9e7..1276bea 100644 --- a/modules/home/scripts/docs-parser.nix +++ b/modules/home/scripts/docs-parser.nix @@ -16,7 +16,7 @@ pkgs.writeShellScriptBin "docs-parser" '' Usage: docs-parser [MODE] [CATEGORY] [LANGUAGE] MODE: files|content - CATEGORY: AI|Hyprpanel|Zed|ddubsos|etc. + CATEGORY: AI|Zed|ddubsos|etc. LANGUAGE: en|es Examples: diff --git a/modules/home/scripts/qs-docs.nix b/modules/home/scripts/qs-docs.nix index 0edeb40..b5dfc82 100644 --- a/modules/home/scripts/qs-docs.nix +++ b/modules/home/scripts/qs-docs.nix @@ -12,7 +12,7 @@ pkgs.writeShellScriptBin "qs-docs" '' Usage: qs-docs [options] Options: - -c CATEGORY Category to display (AI|Hyprpanel|Zed|ddubsos) (default: AI) + -c CATEGORY Category to display (AI|Zed|ddubsos) (default: AI) -l LANGUAGE Language (en|es) (default: en) -h Show this help EOF @@ -316,7 +316,7 @@ pkgs.writeShellScriptBin "qs-docs" '' win.availableCategories = result; } catch (e) { console.error("Failed to parse categories JSON:", e); - win.availableCategories = ["AI", "Hyprpanel", "Zed", "ddubsos"]; + win.availableCategories = ["AI", "Zed", "ddubsos"]; } } } diff --git a/modules/home/scripts/qs-panels.nix b/modules/home/scripts/qs-panels.nix index 500e070..2f0f97c 100644 --- a/modules/home/scripts/qs-panels.nix +++ b/modules/home/scripts/qs-panels.nix @@ -5,7 +5,6 @@ pkgs.writeShellScriptBin "qs-panels" '' # Detect current active panel/bar (robust matching, no regex metachar) active="" - if pgrep -x hyprpanel >/dev/null 2>&1; then active="hyprpanel"; fi if pgrep -x waybar >/dev/null 2>&1; then active="waybar"; fi if pgrep -x dms >/dev/null 2>&1 || pgrep -fa dms | grep -q "\bdms\b.*\brun\b"; then active="dms"; fi if pgrep -fa quickshell | grep -q "noctalia-shell"; then active="noctalia"; fi @@ -66,8 +65,7 @@ pkgs.writeShellScriptBin "qs-panels" '' model: [ { key: "noctalia", label: "Noctalia" }, { key: "dms", label: "DMS" }, - { key: "waybar", label: "Waybar" }, - { key: "hyprpanel",label: "Hyprpanel" } + { key: "waybar", label: "Waybar" } ] delegate: Rectangle { width: 180; height: 52 @@ -149,7 +147,6 @@ pkgs.writeShellScriptBin "qs-panels" '' noctalia) run_and_exit noctalia-run ;; dms) run_and_exit dms-run ;; waybar) run_and_exit waybar-run ;; - hyprpanel)run_and_exit hyprpanel-run ;; *) exit 0 ;; esac '' diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix index 9616939..fdece87 100644 --- a/modules/home/scripts/qs-wallpapers-restore.nix +++ b/modules/home/scripts/qs-wallpapers-restore.nix @@ -51,19 +51,6 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' } start_swww() { - # Honor Hyprpanel requirement: do not start swww-daemon before Hyprpanel - local wait_sec="''${QS_RESTORE_WAIT_HYPRPANEL_SECONDS:-15}" - if ${pkgs.procps}/bin/pgrep -x hyprpanel >/dev/null 2>&1; then - log "hyprpanel detected; proceeding" - else - # If waybar is already running, it's fine to proceed immediately - if ${pkgs.procps}/bin/pgrep -x waybar >/dev/null 2>&1; then - log "waybar detected; proceeding without waiting for hyprpanel" - else - log "Waiting up to ''${wait_sec}s for hyprpanel before starting swww-daemon" - wait_for_proc hyprpanel "$wait_sec" || log "hyprpanel not detected after ''${wait_sec}s; proceeding" - fi - fi # Stop conflicting daemons if we intend to use swww ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true From 6a2df211f9f2cd5d9159ee8e0c84c687089f5ebb Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 22:55:31 -0500 Subject: [PATCH 123/232] 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 --- CHANGELOG.md | 7 +++++++ modules/home/hyprland/binds.nix | 2 ++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7df6c0b..98273da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,13 @@ #### 📅 **Updated: February 16th, 2026** +- Added binding to kill hyprland if stuck + +``` + Force quit the compositor even if locked/frozen +"$modifier CONTROL, BACKSPACE, exec, killall -9 Hyprland" +``` + - Removed `hyprpanel` - No longer maintained - Vendor created `wayle` to replace it diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index a245cc1..baefd32 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -46,6 +46,8 @@ in { ++ rofiBind ++ rofiClipboardBind ++ [ + # Force quit the compositor even if locked/frozen + "$modifier CONTROL, BACKSPACE, exec, killall -9 Hyprland" # ============= WORKSPACE OVERVIEW ============= "$modifier CTRL,D, Toggle Dock, exec, dock" "$modifier, TAB, QS Overview, exec, qs ipc -c overview call overview toggle" From 5d7497d5cf929fd8e9d708e429a0e4d45630e015 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 23:00:04 -0500 Subject: [PATCH 124/232] Added binding to kill hyprland if hung On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: CHANGELOG.md modified: modules/home/hyprland/binds.nix --- CHANGELOG.md | 7 +++++++ modules/home/hyprland/binds.nix | 2 ++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78211af..0d00655 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ #### 📅 **Updated: February 16th, 2026** +- Added Binding to kill hyprland if hung + +``` + # Force quit the compositor even if locked/frozen +"$modifier CONTROL, BACKSPACE, exec, killall -9 Hyprland" +``` + - `webkitgtk` being built from source - Removed audacity is called `wxwidgets` - Created overlay for `tumbler` to disable `libepub` diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index feb03e3..ee8830b 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -44,6 +44,8 @@ in { ++ rofiBind ++ rofiClipboardBind ++ [ + # Force quit the compositor even if locked/frozen + "$modifier CONTROL, BACKSPACE, exec, killall -9 Hyprland" # ============= WORKSPACE OVERVIEW ============= "$modifier CTRL,D, Toggle Dock, exec, dock" "$modifier, TAB, QS Overview, exec, qs ipc -c overview call overview toggle" From e5dac51840755b1dedc540df9c517d8727895e6c Mon Sep 17 00:00:00 2001 From: dwilliams Date: Mon, 16 Feb 2026 23:13:34 -0500 Subject: [PATCH 125/232] Fixed hyprland kill binding --- modules/home/hyprland/binds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index baefd32..f9b8f7a 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -47,7 +47,7 @@ in { ++ rofiClipboardBind ++ [ # Force quit the compositor even if locked/frozen - "$modifier CONTROL, BACKSPACE, exec, killall -9 Hyprland" + "$modifier CTRL, BACKSPACE, Kill Hyprland, exec, killall -9 Hyprland" # ============= WORKSPACE OVERVIEW ============= "$modifier CTRL,D, Toggle Dock, exec, dock" "$modifier, TAB, QS Overview, exec, qs ipc -c overview call overview toggle" From abd97421cb79f6620f1df3e65e3dc51c74751d26 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Mon, 16 Feb 2026 23:15:06 -0500 Subject: [PATCH 126/232] Removed kill hyprland binding doesn't work --- modules/home/hyprland/binds.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index f9b8f7a..a245cc1 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -46,8 +46,6 @@ in { ++ rofiBind ++ rofiClipboardBind ++ [ - # Force quit the compositor even if locked/frozen - "$modifier CTRL, BACKSPACE, Kill Hyprland, exec, killall -9 Hyprland" # ============= WORKSPACE OVERVIEW ============= "$modifier CTRL,D, Toggle Dock, exec, dock" "$modifier, TAB, QS Overview, exec, qs ipc -c overview call overview toggle" From caefd498906d52e6b1caf7ec7119360540254e40 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 23:15:53 -0500 Subject: [PATCH 127/232] Removed kill binding didn't work --- CHANGELOG.md | 7 ------- modules/home/hyprland/binds.nix | 2 -- 2 files changed, 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d00655..78211af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,13 +9,6 @@ #### 📅 **Updated: February 16th, 2026** -- Added Binding to kill hyprland if hung - -``` - # Force quit the compositor even if locked/frozen -"$modifier CONTROL, BACKSPACE, exec, killall -9 Hyprland" -``` - - `webkitgtk` being built from source - Removed audacity is called `wxwidgets` - Created overlay for `tumbler` to disable `libepub` diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index ee8830b..feb03e3 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -44,8 +44,6 @@ in { ++ rofiBind ++ rofiClipboardBind ++ [ - # Force quit the compositor even if locked/frozen - "$modifier CONTROL, BACKSPACE, exec, killall -9 Hyprland" # ============= WORKSPACE OVERVIEW ============= "$modifier CTRL,D, Toggle Dock, exec, dock" "$modifier, TAB, QS Overview, exec, qs ipc -c overview call overview toggle" From e3c98cd6337ff93c1df19d52bfebe756184c777d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 23:16:19 -0500 Subject: [PATCH 128/232] Removed kill binding didn't work --- CHANGELOG.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98273da..7df6c0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,13 +11,6 @@ #### 📅 **Updated: February 16th, 2026** -- Added binding to kill hyprland if stuck - -``` - Force quit the compositor even if locked/frozen -"$modifier CONTROL, BACKSPACE, exec, killall -9 Hyprland" -``` - - Removed `hyprpanel` - No longer maintained - Vendor created `wayle` to replace it From 5957df54fd1b27b9011266c523fa62fee35ea137 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 19 Feb 2026 18:32:43 -0500 Subject: [PATCH 129/232] 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 --- modules/home/scripts/zcli.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index d905fb6..27d3ed5 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -232,18 +232,18 @@ in local has_vm=false if ${pkgs.pciutils}/bin/lspci &> /dev/null; then # Check if lspci is available - if ${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d'; then + if ${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then while read -r line; do if echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'nvidia'; then has_nvidia=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd\|ati\|advanced micro devices'; then has_amd=true elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'intel'; then has_intel=true elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware'; then has_vm=true fi - done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d') + done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display') if "$has_vm"; then detected_profile="vm" From bd7e402430b646784e45bdcc35541c73b3947786 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 19 Feb 2026 18:35:21 -0500 Subject: [PATCH 130/232] Updated CHANGELOG --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7df6c0b..c0adb96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,10 @@ # 🚀 **Current Release - ZaneyOS v2.6.0** -\ + +#### 📅 **Updated: February 19th, 2026** + +- Fixed `zcli` GPU detection for newer AMD GPUs #### 📅 **Updated: February 16th, 2026** From 71629bd238a705dd2137261480800e2200352b3f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 19 Feb 2026 18:47:15 -0500 Subject: [PATCH 131/232] Updated zcli GPU detection script for newer AMD GPUs On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: CHANGELOG.md modified: modules/home/scripts/zcli.nix --- CHANGELOG.md | 4 ++++ modules/home/scripts/zcli.nix | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78211af..acf98a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** +#### 📅 **Updated: February 19th, 2026** + +- Updated `zcli` GPU detection for newer AMD GPUs + #### 📅 **Updated: February 16th, 2026** - `webkitgtk` being built from source diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 36be0f9..ade70ef 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -222,18 +222,18 @@ in local has_vm=false if ${pkgs.pciutils}/bin/lspci &> /dev/null; then # Check if lspci is available - if ${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d'; then + if ${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then while read -r line; do if echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'nvidia'; then has_nvidia=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd\|ati\|advanced micro devices'; then has_amd=true elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'intel'; then has_intel=true elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware'; then has_vm=true fi - done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d') + done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display') if "$has_vm"; then detected_profile="vm" From a5c1fb20648c91ad68b72538623ca75c56b1c5b0 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Thu, 19 Feb 2026 19:44:38 -0500 Subject: [PATCH 132/232] Updted flake, disabled zls, marksman --- CHANGELOG.md | 7 ++-- flake.lock | 60 ++++++++++++++++----------------- modules/home/editors/nixvim.nix | 4 +-- 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0adb96..9fc032e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,13 @@ # 🚀 **Current Release - ZaneyOS v2.6.0** - #### 📅 **Updated: February 19th, 2026** -- Fixed `zcli` GPU detection for newer AMD GPUs +- Fixed `zcli` GPU detection for newer AMD GPUs +- `nixvim.nix` changes + - Disabled Zig language server + - Disabled marksman language server + - Caused dotnet lib to be compiled (takes hours) #### 📅 **Updated: February 16th, 2026** diff --git a/flake.lock b/flake.lock index b778408..1a53c24 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1770196631, - "narHash": "sha256-neRXwIILc8BUFHeT0UM2Mj8Wt1oo4UPpmm4NkfBwQOY=", + "lastModified": 1771198383, + "narHash": "sha256-mOq7ks7gdWyVStIUAp7U8wztanYKt0GgCnIZtPUJ6n8=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "acc9baf089a67ef7456117ef31285e34c3294984", + "rev": "703d29149cc127d1ec7c1885ff14f85d4e6a01ce", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1769872935, - "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", + "lastModified": 1771102945, + "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", + "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399", "type": "github" }, "original": { @@ -387,11 +387,11 @@ }, "mnw": { "locked": { - "lastModified": 1769981889, - "narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=", + "lastModified": 1770419553, + "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", "owner": "Gerg-L", "repo": "mnw", - "rev": "332fed8f43b77149c582f1782683d6aeee1f07cf", + "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770573497, - "narHash": "sha256-pzb4PNz3Ke2PtgK0wLFTgzRJkcE7ICHVIgbgiK5ALfI=", + "lastModified": 1771544579, + "narHash": "sha256-lRI1Vzbhq71PJgkPvAMPHDaQevIjP11WchmMife0gMw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "17b3e84e1a0997797f0c33fbee42ea273deaf56f", + "rev": "6f4a52ddfecaacd54093199429bfbecceef8f007", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -517,11 +517,11 @@ ] }, "locked": { - "lastModified": 1770571663, - "narHash": "sha256-Vqd5senFyozLb7EM7JvScUqC56eQFfSo+xvGFuEVn+8=", + "lastModified": 1771539689, + "narHash": "sha256-8m7xUJSagmhEwA8muBF+ZqG7aWHfO5zj0C1feY3Mi74=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "f9f668dbe64396100d6a8d89618737d3503d013a", + "rev": "1f4d7878782214a0c8dfa9cca493462f2beab87c", "type": "github" }, "original": { @@ -588,11 +588,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1770572967, - "narHash": "sha256-uQ4g+gypEXoNE6bgQq1UP3mrwUNuemhdD3A7G9tbchk=", + "lastModified": 1771494579, + "narHash": "sha256-HIIe59m0NKHRo80i9oWoQAek/te2Y+rv1lp5CJN0tVk=", "owner": "notashelf", "repo": "nvf", - "rev": "7a2c7c23966122eac80620dd503bf2b1163ed6d4", + "rev": "cc76be2ab6ffb8395869918ff3528f0c57960a8a", "type": "github" }, "original": { @@ -651,11 +651,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1770308890, - "narHash": "sha256-7bx8Bn9B2g/loBaz+uLwdKI2rUW+RhDPyP/MqAgvrxU=", + "lastModified": 1771429540, + "narHash": "sha256-YKytDx8LOPOvE+dip1ja+1nbIpDVdqTaFbP4MaXwveM=", "owner": "danth", "repo": "stylix", - "rev": "7e7fa955abac04a8e118b1cedf930a8fd41c34a6", + "rev": "1a5c9d8be82127aeccc929f60b952e8a3df6b63c", "type": "github" }, "original": { @@ -829,11 +829,11 @@ ] }, "locked": { - "lastModified": 1770416716, - "narHash": "sha256-80KR/xJfP9F95IMMXjJc8q+N/UP40TLb0OoAGktRmTE=", + "lastModified": 1771533905, + "narHash": "sha256-QbH4GuYEj5pNO1BeJH5GfbZQ3R5RgCU5V+9a0M+Rmzk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9616286ab63464a302b7879aaf37173d4047cb74", + "rev": "35af78d46972fe50727bfc7d326277063e704609", "type": "github" }, "original": { diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 94ca7e1..2b0203e 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -174,8 +174,8 @@ html.enable = true; cssls.enable = true; clangd.enable = true; - zls.enable = true; - marksman.enable = true; + zls.enable = false; + marksman.enable = false; hyprls.enable = true; # hyprls is optional; keep tools available via extraPackages }; From a69d86baa85dc1ca32e481a8e1c427dcd4683665 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 19 Feb 2026 19:46:34 -0500 Subject: [PATCH 133/232] Updated flake, diabled zls, marksman --- CHANGELOG.md | 5 +++++ flake.lock | 36 ++++++++++++++++----------------- modules/home/editors/nixvim.nix | 4 ++-- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index acf98a3..8a1e129 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,11 @@ #### 📅 **Updated: February 19th, 2026** - Updated `zcli` GPU detection for newer AMD GPUs +- `nixvim.nix` Changes: + - Disabled Zig Language Server + - Wasn't using it + - Disabled Marksmand Language Server + - Caused dotnet libs to build from source (takes hours) #### 📅 **Updated: February 16th, 2026** diff --git a/flake.lock b/flake.lock index 0e01fdd..207e3a7 100644 --- a/flake.lock +++ b/flake.lock @@ -380,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771294474, - "narHash": "sha256-DbvnUIjLYVKGxkT33XF6y0Zz0TDk1plcloMQ0IeiHB8=", + "lastModified": 1771544579, + "narHash": "sha256-lRI1Vzbhq71PJgkPvAMPHDaQevIjP11WchmMife0gMw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "80cd9310019145aa23379b1395381d056cc7ac18", + "rev": "6f4a52ddfecaacd54093199429bfbecceef8f007", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1771269759, - "narHash": "sha256-OcSMUdOxKeCCNV+gOgZWP+BOGedi3QxxGNIbQQQsEFk=", + "lastModified": 1771539689, + "narHash": "sha256-8m7xUJSagmhEwA8muBF+ZqG7aWHfO5zj0C1feY3Mi74=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "c33db6b999a884000e33ec2d018ef9de394bf42a", + "rev": "1f4d7878782214a0c8dfa9cca493462f2beab87c", "type": "github" }, "original": { @@ -518,11 +518,11 @@ ] }, "locked": { - "lastModified": 1771274219, - "narHash": "sha256-n7CZAK+mTko+y3SSwvFt49AD1RNLY2KcHypcoly8HVc=", + "lastModified": 1771494579, + "narHash": "sha256-HIIe59m0NKHRo80i9oWoQAek/te2Y+rv1lp5CJN0tVk=", "owner": "notashelf", "repo": "nvf", - "rev": "99bf160aaef28d47f1818deffe662ce1c4d6e6a1", + "rev": "cc76be2ab6ffb8395869918ff3528f0c57960a8a", "type": "github" }, "original": { @@ -569,11 +569,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1770308890, - "narHash": "sha256-7bx8Bn9B2g/loBaz+uLwdKI2rUW+RhDPyP/MqAgvrxU=", + "lastModified": 1771429540, + "narHash": "sha256-YKytDx8LOPOvE+dip1ja+1nbIpDVdqTaFbP4MaXwveM=", "owner": "danth", "repo": "stylix", - "rev": "7e7fa955abac04a8e118b1cedf930a8fd41c34a6", + "rev": "1a5c9d8be82127aeccc929f60b952e8a3df6b63c", "type": "github" }, "original": { @@ -717,11 +717,11 @@ ] }, "locked": { - "lastModified": 1771247135, - "narHash": "sha256-qDFOVzhs8S/dk3Eqvyqi7veWKEviZuh0hjTNsb4TZ2I=", + "lastModified": 1771533905, + "narHash": "sha256-QbH4GuYEj5pNO1BeJH5GfbZQ3R5RgCU5V+9a0M+Rmzk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a96ac9e2ae07ccd8522a790ff720db11dd3bdd6e", + "rev": "35af78d46972fe50727bfc7d326277063e704609", "type": "github" }, "original": { diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index ea26cad..cedafeb 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -150,8 +150,8 @@ html.enable = true; cssls.enable = true; clangd.enable = true; - zls.enable = true; - marksman.enable = true; + zls.enable = false; + marksman.enable = false; hyprls.enable = true; # hyprls is optional; keep tools available via extraPackages }; From 4f8d983ab3d03f470571dc09ac6ba3bf74e42f22 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 24 Feb 2026 18:26:18 -0500 Subject: [PATCH 134/232] Updated install script with newer AMD GPU support --- install-zaneyos.sh | 6 +++--- modules/home/install-zaneyos.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index eb90f5d..3060e09 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -139,18 +139,18 @@ has_intel=false has_amd=false has_vm=false -if lspci | grep -qi 'vga\|3d'; then +if lspci | grep -qi 'vga\|3d\|display'; then while read -r line; do if echo "$line" | grep -qi 'nvidia'; then has_nvidia=true - elif echo "$line" | grep -qi 'amd'; then + elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then has_amd=true elif echo "$line" | grep -qi 'intel'; then has_intel=true elif echo "$line" | grep -qi 'virtio\|vmware'; then has_vm=true fi - done < <(lspci | grep -i 'vga\|3d') + done < <(lspci | grep -i 'vga\|3d\|display') if $has_vm; then DETECTED_PROFILE="vm" diff --git a/modules/home/install-zaneyos.sh b/modules/home/install-zaneyos.sh index a3fdc50..cf88a04 100755 --- a/modules/home/install-zaneyos.sh +++ b/modules/home/install-zaneyos.sh @@ -102,18 +102,18 @@ has_intel=false has_amd=false has_vm=false -if lspci | grep -qi 'vga\|3d'; then +if lspci | grep -qi 'vga\|3d\|display'; then while read -r line; do if echo "$line" | grep -qi 'nvidia'; then has_nvidia=true - elif echo "$line" | grep -qi 'amd'; then + elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then has_amd=true elif echo "$line" | grep -qi 'intel'; then has_intel=true elif echo "$line" | grep -qi 'virtio\|vmware'; then has_vm=true fi - done < <(lspci | grep -i 'vga\|3d') + done < <(lspci | grep -i 'vga\|3d\|display') if $has_vm; then DETECTED_PROFILE="vm" From a1104b4c1b808f1890ff3b5aba3c9d0ed22ce644 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 24 Feb 2026 18:29:40 -0500 Subject: [PATCH 135/232] Updated install scripts to detect newer AMD GPUs On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: install-zaneyos.sh modified: modules/home/install-zaneyos.sh --- install-zaneyos.sh | 6 +++--- modules/home/install-zaneyos.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 84bfe70..3144010 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -150,18 +150,18 @@ has_intel=false has_amd=false has_vm=false -if lspci | grep -qi 'vga\|3d'; then +if lspci | grep -qi 'vga\|3d\|display'; then while read -r line; do if echo "$line" | grep -qi 'nvidia'; then has_nvidia=true - elif echo "$line" | grep -qi 'amd'; then + elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then has_amd=true elif echo "$line" | grep -qi 'intel'; then has_intel=true elif echo "$line" | grep -qi 'virtio\|vmware'; then has_vm=true fi - done < <(lspci | grep -i 'vga\|3d') + done < <(lspci | grep -i 'vga\|3d\|display') if $has_vm; then DETECTED_PROFILE="vm" diff --git a/modules/home/install-zaneyos.sh b/modules/home/install-zaneyos.sh index e276f96..14066d3 100755 --- a/modules/home/install-zaneyos.sh +++ b/modules/home/install-zaneyos.sh @@ -110,18 +110,18 @@ has_intel=false has_amd=false has_vm=false -if lspci | grep -qi 'vga\|3d'; then +if lspci | grep -qi 'vga\|3d\|display'; then while read -r line; do if echo "$line" | grep -qi 'nvidia'; then has_nvidia=true - elif echo "$line" | grep -qi 'amd'; then + elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then has_amd=true elif echo "$line" | grep -qi 'intel'; then has_intel=true elif echo "$line" | grep -qi 'virtio\|vmware'; then has_vm=true fi - done < <(lspci | grep -i 'vga\|3d') + done < <(lspci | grep -i 'vga\|3d\|display') if $has_vm; then DETECTED_PROFILE="vm" From 0d2b750e37b4d78c1d7c3ad84dcaba6296f33dec Mon Sep 17 00:00:00 2001 From: dwilliams Date: Thu, 26 Feb 2026 15:15:21 -0500 Subject: [PATCH 136/232] Updated flake, fixed togglesplit binding --- flake.lock | 72 +++++++++++++++++++++------------ flake.nix | 2 +- modules/home/hyprland/binds.nix | 2 +- 3 files changed, 49 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 1a53c24..159877b 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1771198383, - "narHash": "sha256-mOq7ks7gdWyVStIUAp7U8wztanYKt0GgCnIZtPUJ6n8=", + "lastModified": 1771838453, + "narHash": "sha256-gyEdrdS8AlD/zx8xrWhpZw4pAZt/JD5MlZrQ2GNMsO4=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "703d29149cc127d1ec7c1885ff14f85d4e6a01ce", + "rev": "f29019bebf76cd9571ad29febfec658a1f842c4d", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1770260404, - "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", + "lastModified": 1772020340, + "narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", + "rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1771102945, - "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=", + "lastModified": 1771756436, + "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399", + "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771544579, - "narHash": "sha256-lRI1Vzbhq71PJgkPvAMPHDaQevIjP11WchmMife0gMw=", + "lastModified": 1772129330, + "narHash": "sha256-XA+O6LExWx47RRCDX6GqM30VAc5TzxlGvChRn3m9Nz8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6f4a52ddfecaacd54093199429bfbecceef8f007", + "rev": "8c13b5b3bfa5676328c7e9ab9882ed47ddbc3cb4", "type": "github" }, "original": { @@ -514,14 +514,15 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1771539689, - "narHash": "sha256-8m7xUJSagmhEwA8muBF+ZqG7aWHfO5zj0C1feY3Mi74=", + "lastModified": 1772131976, + "narHash": "sha256-sfki5hpMegyjjK4ccDiLvy4DWQe1Nz2doI3ByqOHkyg=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "1f4d7878782214a0c8dfa9cca493462f2beab87c", + "rev": "28dc8229b77a8c3e5b23f20306d821de3e13a84c", "type": "github" }, "original": { @@ -530,6 +531,27 @@ "type": "github" } }, + "noctalia-qs": { + "inputs": { + "nixpkgs": [ + "noctalia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771796397, + "narHash": "sha256-lbZkAMNQl5Ymqhdvp46K8hubZ7n7KQRPnTP5bNJzMSk=", + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "rev": "1711c5a20b74a31b703394164c5d2d9561f13ee9", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -588,11 +610,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1771494579, - "narHash": "sha256-HIIe59m0NKHRo80i9oWoQAek/te2Y+rv1lp5CJN0tVk=", + "lastModified": 1771903194, + "narHash": "sha256-VpDCSVIwiHdcezsksOTnRmqPqpkssGRi4wMsA+46dvc=", "owner": "notashelf", "repo": "nvf", - "rev": "cc76be2ab6ffb8395869918ff3528f0c57960a8a", + "rev": "d07d8f62f03a313cfcf55feb3797e4cbda8d08a5", "type": "github" }, "original": { @@ -651,11 +673,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1771429540, - "narHash": "sha256-YKytDx8LOPOvE+dip1ja+1nbIpDVdqTaFbP4MaXwveM=", + "lastModified": 1771788390, + "narHash": "sha256-RzBpBwn93GWxLjacTte+ngwwg0L/BVOg4G/sSIeK3Rw=", "owner": "danth", "repo": "stylix", - "rev": "1a5c9d8be82127aeccc929f60b952e8a3df6b63c", + "rev": "ebb238f14d6f930068be4718472da3105fd5d3bf", "type": "github" }, "original": { @@ -829,11 +851,11 @@ ] }, "locked": { - "lastModified": 1771533905, - "narHash": "sha256-QbH4GuYEj5pNO1BeJH5GfbZQ3R5RgCU5V+9a0M+Rmzk=", + "lastModified": 1771839226, + "narHash": "sha256-oV17HfmV3rlvZmr3m34VWfxGyt9Z8VVx2FcoK/PQO9s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "35af78d46972fe50727bfc7d326277063e704609", + "rev": "9ee8fb00d7333b1b2b65d686b160da19a57d5730", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7af3aa5..c07b20d 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,7 @@ } @ inputs: let system = "x86_64-linux"; host = "zaneyos-24-vm"; - profile = "vm"; + profile = "amd"; username = "dwilliams"; # Deduplicate nixosConfigurations while preserving the top-level 'profile' diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index a245cc1..383b744 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -76,7 +76,7 @@ in { # ============= WINDOW MANAGEMENT ============= "$modifier,Q, Kill Active Window, killactive," "$modifier,P, Pseudo Tile, pseudo," - "$modifier SHIFT,I, Toggle Split, togglesplit," + "$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit," "$modifier,F, Maximize, fullscreen," "$modifier SHIFT,F, Toggle Floating, togglefloating," "$modifier ALT,F, Float All Windows, workspaceopt, allfloat" From a9c573e59e6c610e35ad1ce054489dadec6df066 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 26 Feb 2026 15:22:04 -0500 Subject: [PATCH 137/232] Fixing GPU detection --- modules/home/scripts/zcli.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 27d3ed5..ec31bdf 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -230,6 +230,11 @@ in local has_intel=false local has_amd=false local has_vm=false + # Prefer hypervisor detection first to avoid misclassifying VMs as AMD + if ${pkgs.systemd}/bin/systemd-detect-virt -q; then + echo "vm" + return + fi if ${pkgs.pciutils}/bin/lspci &> /dev/null; then # Check if lspci is available if ${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then @@ -240,7 +245,7 @@ in has_amd=true elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'intel'; then has_intel=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware\|qxl\|qemu\|virtualbox\|bochs\|hyper-v\|microsoft'; then has_vm=true fi done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display') From bdcfb17a63c15e0c1074d3c307df6a29706fcbd1 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 26 Feb 2026 15:25:13 -0500 Subject: [PATCH 138/232] Updated flake and fixed HL binds for togglespit On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: flake.lock modified: hosts/zaneyos-next/variables.nix modified: modules/home/hyprland/binds.nix --- flake.lock | 78 ++++++++++++++++++++------------ hosts/zaneyos-next/variables.nix | 2 +- modules/home/hyprland/binds.nix | 2 +- 3 files changed, 52 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 207e3a7..09571a7 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1771198383, - "narHash": "sha256-mOq7ks7gdWyVStIUAp7U8wztanYKt0GgCnIZtPUJ6n8=", + "lastModified": 1771838453, + "narHash": "sha256-gyEdrdS8AlD/zx8xrWhpZw4pAZt/JD5MlZrQ2GNMsO4=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "703d29149cc127d1ec7c1885ff14f85d4e6a01ce", + "rev": "f29019bebf76cd9571ad29febfec658a1f842c4d", "type": "github" }, "original": { @@ -262,11 +262,11 @@ ] }, "locked": { - "lastModified": 1770260404, - "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", + "lastModified": 1772020340, + "narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", + "rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc", "type": "github" }, "original": { @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1771102945, - "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=", + "lastModified": 1771756436, + "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399", + "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771544579, - "narHash": "sha256-lRI1Vzbhq71PJgkPvAMPHDaQevIjP11WchmMife0gMw=", + "lastModified": 1772129330, + "narHash": "sha256-XA+O6LExWx47RRCDX6GqM30VAc5TzxlGvChRn3m9Nz8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6f4a52ddfecaacd54093199429bfbecceef8f007", + "rev": "8c13b5b3bfa5676328c7e9ab9882ed47ddbc3cb4", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -440,14 +440,15 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1771539689, - "narHash": "sha256-8m7xUJSagmhEwA8muBF+ZqG7aWHfO5zj0C1feY3Mi74=", + "lastModified": 1772131976, + "narHash": "sha256-sfki5hpMegyjjK4ccDiLvy4DWQe1Nz2doI3ByqOHkyg=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "1f4d7878782214a0c8dfa9cca493462f2beab87c", + "rev": "28dc8229b77a8c3e5b23f20306d821de3e13a84c", "type": "github" }, "original": { @@ -456,6 +457,27 @@ "type": "github" } }, + "noctalia-qs": { + "inputs": { + "nixpkgs": [ + "noctalia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771796397, + "narHash": "sha256-lbZkAMNQl5Ymqhdvp46K8hubZ7n7KQRPnTP5bNJzMSk=", + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "rev": "1711c5a20b74a31b703394164c5d2d9561f13ee9", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -518,11 +540,11 @@ ] }, "locked": { - "lastModified": 1771494579, - "narHash": "sha256-HIIe59m0NKHRo80i9oWoQAek/te2Y+rv1lp5CJN0tVk=", + "lastModified": 1771903194, + "narHash": "sha256-VpDCSVIwiHdcezsksOTnRmqPqpkssGRi4wMsA+46dvc=", "owner": "notashelf", "repo": "nvf", - "rev": "cc76be2ab6ffb8395869918ff3528f0c57960a8a", + "rev": "d07d8f62f03a313cfcf55feb3797e4cbda8d08a5", "type": "github" }, "original": { @@ -569,11 +591,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1771429540, - "narHash": "sha256-YKytDx8LOPOvE+dip1ja+1nbIpDVdqTaFbP4MaXwveM=", + "lastModified": 1771788390, + "narHash": "sha256-RzBpBwn93GWxLjacTte+ngwwg0L/BVOg4G/sSIeK3Rw=", "owner": "danth", "repo": "stylix", - "rev": "1a5c9d8be82127aeccc929f60b952e8a3df6b63c", + "rev": "ebb238f14d6f930068be4718472da3105fd5d3bf", "type": "github" }, "original": { @@ -717,11 +739,11 @@ ] }, "locked": { - "lastModified": 1771533905, - "narHash": "sha256-QbH4GuYEj5pNO1BeJH5GfbZQ3R5RgCU5V+9a0M+Rmzk=", + "lastModified": 1771839226, + "narHash": "sha256-oV17HfmV3rlvZmr3m34VWfxGyt9Z8VVx2FcoK/PQO9s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "35af78d46972fe50727bfc7d326277063e704609", + "rev": "9ee8fb00d7333b1b2b65d686b160da19a57d5730", "type": "github" }, "original": { diff --git a/hosts/zaneyos-next/variables.nix b/hosts/zaneyos-next/variables.nix index 356a233..7298e70 100644 --- a/hosts/zaneyos-next/variables.nix +++ b/hosts/zaneyos-next/variables.nix @@ -17,7 +17,7 @@ _: { # would be common hostName = "zaneyos-next"; - gpuProfile = "vm"; + gpuProfile = "amd"; # Set Display Manager # `tui` for Text login diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index feb03e3..8e1ddfd 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -74,7 +74,7 @@ in { # ============= WINDOW MANAGEMENT ============= "$modifier,Q, Kill Active Window, killactive," "$modifier,P, Pseudo Tile, pseudo," - "$modifier SHIFT,I, Toggle Split, togglesplit," + "$modifier SHIFT,I, Toggle Split, layoutmgr, togglesplit," "$modifier,F, Maximize, fullscreen," "$modifier SHIFT,F, Toggle Floating, togglefloating," "$modifier ALT,F, Float All Windows, workspaceopt, allfloat" From acb3ddb125f6318d01fa10bf4d1b0c1e1090fd87 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 26 Feb 2026 15:27:07 -0500 Subject: [PATCH 139/232] Fixing GPU detection --- modules/home/scripts/zcli.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index ade70ef..2d1b8ff 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -220,6 +220,11 @@ in local has_intel=false local has_amd=false local has_vm=false + # Prefer hypervisor detection first to avoid misclassifying VMs as AMD + if ${pkgs.systemd}/bin/systemd-detect-virt -q; then + echo "vm" + return + fi if ${pkgs.pciutils}/bin/lspci &> /dev/null; then # Check if lspci is available if ${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then @@ -230,7 +235,7 @@ in has_amd=true elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'intel'; then has_intel=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware\|qxl\|qemu\|virtualbox\|bochs\|hyper-v\|microsoft'; then has_vm=true fi done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display') From 2ababcca8bd84d917baebf385a8c65d2d8fe804f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 26 Feb 2026 15:31:18 -0500 Subject: [PATCH 140/232] Updated CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fc032e..61a2b90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ #### 📅 **Updated: February 19th, 2026** - Fixed `zcli` GPU detection for newer AMD GPUs + - Fixed the fix to properly detect VMs - `nixvim.nix` changes - Disabled Zig language server - Disabled marksman language server From 052b690e39969056118b0681bcf2a39f45faaec4 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 26 Feb 2026 15:40:31 -0500 Subject: [PATCH 141/232] Typo in togglesplit command --- modules/home/hyprland/binds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 8e1ddfd..017447e 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -74,7 +74,7 @@ in { # ============= WINDOW MANAGEMENT ============= "$modifier,Q, Kill Active Window, killactive," "$modifier,P, Pseudo Tile, pseudo," - "$modifier SHIFT,I, Toggle Split, layoutmgr, togglesplit," + "$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit," "$modifier,F, Maximize, fullscreen," "$modifier SHIFT,F, Toggle Floating, togglefloating," "$modifier ALT,F, Float All Windows, workspaceopt, allfloat" From 695959035ba425a8f9fa814da37c292af1d38964 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 26 Feb 2026 15:43:07 -0500 Subject: [PATCH 142/232] Fixed zos-next gpu setting --- hosts/zaneyos-next/variables.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/zaneyos-next/variables.nix b/hosts/zaneyos-next/variables.nix index 7298e70..356a233 100644 --- a/hosts/zaneyos-next/variables.nix +++ b/hosts/zaneyos-next/variables.nix @@ -17,7 +17,7 @@ _: { # would be common hostName = "zaneyos-next"; - gpuProfile = "amd"; + gpuProfile = "vm"; # Set Display Manager # `tui` for Text login From 56c5206e1809e2685b690f912002fc4e127af899 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 26 Feb 2026 17:47:41 -0500 Subject: [PATCH 143/232] Removed comma after togglesplit --- modules/home/hyprland/binds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 017447e..995f8df 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -74,7 +74,7 @@ in { # ============= WINDOW MANAGEMENT ============= "$modifier,Q, Kill Active Window, killactive," "$modifier,P, Pseudo Tile, pseudo," - "$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit," + "$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit" "$modifier,F, Maximize, fullscreen," "$modifier SHIFT,F, Toggle Floating, togglefloating," "$modifier ALT,F, Float All Windows, workspaceopt, allfloat" From 7bed90e2d267382a3ef976395f00674ab8ebc2b8 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 2 Mar 2026 03:49:10 -0500 Subject: [PATCH 144/232] Added overlay for deno and added nixpkgs stable to flake On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: flake.nix modified: modules/core/overlays.nix --- flake.nix | 1 + modules/core/overlays.nix | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/flake.nix b/flake.nix index 43eeafa..63ff269 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ }; nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/release-25.05"; nvf = { url = "github:notashelf/nvf"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index 94991f6..bd38129 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -10,6 +10,11 @@ config.allowUnfree = true; }; }) + # Prefer stable mpv-with-scripts and yt-dlp to avoid deno source builds + (final: _prev: { + mpv-with-scripts = inputs.nixpkgs-stable.legacyPackages.${final.stdenv.hostPlatform.system}.mpv-with-scripts; + yt-dlp = inputs.nixpkgs-stable.legacyPackages.${final.stdenv.hostPlatform.system}.yt-dlp; + }) # Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk (_final: prev: { From 3c92bdc854b103baec45f7dc6206b8f8dd09292b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 2 Mar 2026 04:05:34 -0500 Subject: [PATCH 145/232] Updated flake On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: flake.lock --- flake.lock | 67 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 09571a7..4c95cba 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1771838453, - "narHash": "sha256-gyEdrdS8AlD/zx8xrWhpZw4pAZt/JD5MlZrQ2GNMsO4=", + "lastModified": 1772177232, + "narHash": "sha256-wVhLe9vJEoOf0mx+Z9CrynLm360oqXKMUVt+F6FGIlk=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "f29019bebf76cd9571ad29febfec658a1f842c4d", + "rev": "df7c7f6471154ec826aed1aefd8cd94e9002ad26", "type": "github" }, "original": { @@ -262,11 +262,11 @@ ] }, "locked": { - "lastModified": 1772020340, - "narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=", + "lastModified": 1772380125, + "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc", + "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772129330, - "narHash": "sha256-XA+O6LExWx47RRCDX6GqM30VAc5TzxlGvChRn3m9Nz8=", + "lastModified": 1772427700, + "narHash": "sha256-0z+PYDRPM40TLlUmDEro0S66JH/wnMehZM/L+QDX69c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8c13b5b3bfa5676328c7e9ab9882ed47ddbc3cb4", + "rev": "21d7e2d1c731f4e8fff93613ee63972fda4eb0c5", "type": "github" }, "original": { @@ -394,13 +394,29 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-stable": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1768649915, + "narHash": "sha256-jc21hKogFnxU7KXSVTRmxC7u5D4RHwm9BAvDf5/Z1Uo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "3e3f3c7f9977dc123c23ee21e8085ed63daf8c37", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "type": "github" }, "original": { @@ -444,11 +460,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772131976, - "narHash": "sha256-sfki5hpMegyjjK4ccDiLvy4DWQe1Nz2doI3ByqOHkyg=", + "lastModified": 1772434878, + "narHash": "sha256-nJtHZ6uwOaztMYKejn/tLfK1MnEXh5zgniZsmaOygr8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "28dc8229b77a8c3e5b23f20306d821de3e13a84c", + "rev": "2a692ba942dade06e74cf15426e4af26a90c03fe", "type": "github" }, "original": { @@ -465,11 +481,11 @@ ] }, "locked": { - "lastModified": 1771796397, - "narHash": "sha256-lbZkAMNQl5Ymqhdvp46K8hubZ7n7KQRPnTP5bNJzMSk=", + "lastModified": 1772227064, + "narHash": "sha256-f821ZSoGpa/aXrWq0gPpea9qBnX8KDyavGKkptz2Mog=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "1711c5a20b74a31b703394164c5d2d9561f13ee9", + "rev": "0741d27d2f7db567270f139c5d1684614ecf9863", "type": "github" }, "original": { @@ -540,11 +556,11 @@ ] }, "locked": { - "lastModified": 1771903194, - "narHash": "sha256-VpDCSVIwiHdcezsksOTnRmqPqpkssGRi4wMsA+46dvc=", + "lastModified": 1772219256, + "narHash": "sha256-8RH/xcZOEDf2fJ5h/PSXKxmTnsIMV4AXBj3F8ZdJgyw=", "owner": "notashelf", "repo": "nvf", - "rev": "d07d8f62f03a313cfcf55feb3797e4cbda8d08a5", + "rev": "c07410f1838ce6a44708c49b8ed6fb061babc5ac", "type": "github" }, "original": { @@ -559,6 +575,7 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "noctalia": "noctalia", @@ -739,11 +756,11 @@ ] }, "locked": { - "lastModified": 1771839226, - "narHash": "sha256-oV17HfmV3rlvZmr3m34VWfxGyt9Z8VVx2FcoK/PQO9s=", + "lastModified": 1772317412, + "narHash": "sha256-K2nKL/oUEPMGvJrQl6uHEu8BWt/Ss/tGJaA1omBGTUc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9ee8fb00d7333b1b2b65d686b160da19a57d5730", + "rev": "6678377209685f3987864355bdc3d14288cfc72d", "type": "github" }, "original": { From 39b8117fcf10206f9e39c5e6c9cb547fb74d92e4 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 2 Mar 2026 04:09:26 -0500 Subject: [PATCH 146/232] 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 --- flake.nix | 2 ++ modules/core/overlays.nix | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c07b20d..126fd0b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/release-25.05"; nvf.url = "github:notashelf/nvf"; stylix.url = "github:danth/stylix/release-25.11"; nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest"; diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index f2d25f9..137cfe6 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -2,7 +2,18 @@ nixpkgs.overlays = [ # Provide pkgs.google-antigravity via antigravity-nix overlay inputs.antigravity-nix.overlays.default - + # pkgs.unstable overlay for bleeding edge applications + (_final: prev: { + unstable = import inputs.nixpkgs-unstable { + inherit (prev.stdenv.hostPlatform) system; + config.allowUnfree = true; + }; + }) + # Prefer stable mpv-with-scripts and yt-dlp to avoid deno source builds + (final: _prev: { + mpv-with-scripts = inputs.nixpkgs-stable.legacyPackages.${final.stdenv.hostPlatform.system}.mpv-with-scripts; + yt-dlp = inputs.nixpkgs-stable.legacyPackages.${final.stdenv.hostPlatform.system}.yt-dlp; + }) # Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk (_final: prev: { xfce = prev.xfce // { From d10a9bc6deb385a3a60b6074c78f780edf04452d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 2 Mar 2026 04:24:20 -0500 Subject: [PATCH 147/232] 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 --- modules/home/scripts/zcli.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index ec31bdf..9d14cfd 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -17,6 +17,13 @@ ICON_ROCKET="🚀" # --- 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" + } print_status() { echo echo "--- $ICON_INFO $1 ---" @@ -130,7 +137,7 @@ in # --- Configuration --- PROJECT="zaneyos" #ddubos or zaneyos - PROFILE="${profile}" + PROFILE_DEFAULT="${profile}" BACKUP_FILES_STR="${backupFilesString}" VERSION="1.0.2" FLAKE_NIX_PATH="$HOME/$PROJECT/flake.nix" @@ -341,6 +348,10 @@ in } # --- 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 From 117b4c0039bcd94c5398b6677ec18d30ff08a61e Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 2 Mar 2026 04:31:02 -0500 Subject: [PATCH 148/232] 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 --- modules/home/scripts/zcli.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 9d14cfd..407238f 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -17,13 +17,6 @@ ICON_ROCKET="🚀" # --- 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" - } print_status() { echo echo "--- $ICON_INFO $1 ---" @@ -145,6 +138,13 @@ in read -r -a BACKUP_FILES <<< "$BACKUP_FILES_STR" # --- Helper Functions --- + get_flake_profile() { + local flake_profile="" + if [ -f "$FLAKE_NIX_PATH" ]; then + flake_profile=$(${pkgs.gnugrep}/bin/grep -E '^[[:space:]]*profile[[:space:]]*=' "$FLAKE_NIX_PATH" | ${pkgs.gnused}/bin/sed 's/.*=[[:space:]]*"\([^"]*\)".*/\1/') + fi + echo "$flake_profile" + } verify_hostname() { local current_hostname local flake_hostname From 60f11d70c3c80e0e37432c4db3a520eefcf22f51 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Mon, 2 Mar 2026 04:40:33 -0500 Subject: [PATCH 149/232] Updated flake to test GPU detection --- flake.lock | 76 +++++++++++++++++++++++++++++++++++++++--------------- flake.nix | 2 +- 2 files changed, 56 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 159877b..02d75d2 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1771838453, - "narHash": "sha256-gyEdrdS8AlD/zx8xrWhpZw4pAZt/JD5MlZrQ2GNMsO4=", + "lastModified": 1772177232, + "narHash": "sha256-wVhLe9vJEoOf0mx+Z9CrynLm360oqXKMUVt+F6FGIlk=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "f29019bebf76cd9571ad29febfec658a1f842c4d", + "rev": "df7c7f6471154ec826aed1aefd8cd94e9002ad26", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1772020340, - "narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=", + "lastModified": 1772380125, + "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc", + "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772129330, - "narHash": "sha256-XA+O6LExWx47RRCDX6GqM30VAc5TzxlGvChRn3m9Nz8=", + "lastModified": 1772427700, + "narHash": "sha256-0z+PYDRPM40TLlUmDEro0S66JH/wnMehZM/L+QDX69c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8c13b5b3bfa5676328c7e9ab9882ed47ddbc3cb4", + "rev": "21d7e2d1c731f4e8fff93613ee63972fda4eb0c5", "type": "github" }, "original": { @@ -454,6 +454,38 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1768649915, + "narHash": "sha256-jc21hKogFnxU7KXSVTRmxC7u5D4RHwm9BAvDf5/Z1Uo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3e3f3c7f9977dc123c23ee21e8085ed63daf8c37", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1771008912, @@ -518,11 +550,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772131976, - "narHash": "sha256-sfki5hpMegyjjK4ccDiLvy4DWQe1Nz2doI3ByqOHkyg=", + "lastModified": 1772434878, + "narHash": "sha256-nJtHZ6uwOaztMYKejn/tLfK1MnEXh5zgniZsmaOygr8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "28dc8229b77a8c3e5b23f20306d821de3e13a84c", + "rev": "2a692ba942dade06e74cf15426e4af26a90c03fe", "type": "github" }, "original": { @@ -539,11 +571,11 @@ ] }, "locked": { - "lastModified": 1771796397, - "narHash": "sha256-lbZkAMNQl5Ymqhdvp46K8hubZ7n7KQRPnTP5bNJzMSk=", + "lastModified": 1772227064, + "narHash": "sha256-f821ZSoGpa/aXrWq0gPpea9qBnX8KDyavGKkptz2Mog=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "1711c5a20b74a31b703394164c5d2d9561f13ee9", + "rev": "0741d27d2f7db567270f139c5d1684614ecf9863", "type": "github" }, "original": { @@ -610,11 +642,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1771903194, - "narHash": "sha256-VpDCSVIwiHdcezsksOTnRmqPqpkssGRi4wMsA+46dvc=", + "lastModified": 1772219256, + "narHash": "sha256-8RH/xcZOEDf2fJ5h/PSXKxmTnsIMV4AXBj3F8ZdJgyw=", "owner": "notashelf", "repo": "nvf", - "rev": "d07d8f62f03a313cfcf55feb3797e4cbda8d08a5", + "rev": "c07410f1838ce6a44708c49b8ed6fb061babc5ac", "type": "github" }, "original": { @@ -630,6 +662,8 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "noctalia": "noctalia", "nvf": "nvf", @@ -851,11 +885,11 @@ ] }, "locked": { - "lastModified": 1771839226, - "narHash": "sha256-oV17HfmV3rlvZmr3m34VWfxGyt9Z8VVx2FcoK/PQO9s=", + "lastModified": 1772317412, + "narHash": "sha256-K2nKL/oUEPMGvJrQl6uHEu8BWt/Ss/tGJaA1omBGTUc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9ee8fb00d7333b1b2b65d686b160da19a57d5730", + "rev": "6678377209685f3987864355bdc3d14288cfc72d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 126fd0b..ad7cff5 100644 --- a/flake.nix +++ b/flake.nix @@ -50,7 +50,7 @@ } @ inputs: let system = "x86_64-linux"; host = "zaneyos-24-vm"; - profile = "amd"; + profile = "vm"; username = "dwilliams"; # Deduplicate nixosConfigurations while preserving the top-level 'profile' From fd651fcca7ab99e2329366ba5d907b3b09e1879d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Wed, 4 Mar 2026 00:33:56 -0500 Subject: [PATCH 150/232] Updated flake On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 4c95cba..d9565fa 100644 --- a/flake.lock +++ b/flake.lock @@ -380,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772427700, - "narHash": "sha256-0z+PYDRPM40TLlUmDEro0S66JH/wnMehZM/L+QDX69c=", + "lastModified": 1772598333, + "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "21d7e2d1c731f4e8fff93613ee63972fda4eb0c5", + "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", "type": "github" }, "original": { @@ -412,11 +412,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1772542754, + "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", "type": "github" }, "original": { @@ -460,11 +460,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772434878, - "narHash": "sha256-nJtHZ6uwOaztMYKejn/tLfK1MnEXh5zgniZsmaOygr8=", + "lastModified": 1772589145, + "narHash": "sha256-p4Top4gFt0K78xkPdsJVhljeiE91hyAUzD3x5xZZ88A=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "2a692ba942dade06e74cf15426e4af26a90c03fe", + "rev": "92161fa136ec7fd135fad9c23616066f6bfc6e66", "type": "github" }, "original": { @@ -556,11 +556,11 @@ ] }, "locked": { - "lastModified": 1772219256, - "narHash": "sha256-8RH/xcZOEDf2fJ5h/PSXKxmTnsIMV4AXBj3F8ZdJgyw=", + "lastModified": 1772567589, + "narHash": "sha256-PvIjrYbD2HDj78mWnkEodXeHyeNe9oUS68PTzqbOtH4=", "owner": "notashelf", "repo": "nvf", - "rev": "c07410f1838ce6a44708c49b8ed6fb061babc5ac", + "rev": "6dba3fd0a7bb4fbeb0f55adb4840d620b77275cf", "type": "github" }, "original": { From f1e6e37d1a3c0e94a011d3939bc628e1423128ec Mon Sep 17 00:00:00 2001 From: Don Williams Date: Wed, 4 Mar 2026 17:43:44 -0500 Subject: [PATCH 151/232] Move to unstable branch, dropped pyprland for DropTerminal many other fixes --- CHANGELOG.md | 31 +- FAQ.es.md | 6 +- FAQ.md | 10 +- README.es.md | 2 +- README.md | 2 +- .../hyprland-customization-guide.es.md | 2 +- cheatsheets/hyprland-customization-guide.md | 2 +- .../hyprland-customization-guide.es.md | 2 +- .../hyprland/hyprland-customization-guide.md | 4 +- flake.lock | 186 ++---- flake.nix | 10 +- modules/core/overlays.nix | 13 - modules/core/packages.nix | 6 +- modules/core/system.nix | 4 - modules/home/hyprland/binds.nix | 6 +- modules/home/hyprland/default.nix | 1 - modules/home/hyprland/hyprland.nix | 2 +- modules/home/hyprland/pyprland.nix | 18 - modules/home/hyprland/windowrules.nix | 547 ++++++++++++++---- modules/home/scripts/DropTerminal.nix | 414 +++++++++++++ modules/home/scripts/default.nix | 13 + modules/home/scripts/hyprland-dock.nix | 5 +- modules/home/scripts/hyprland-float-all.nix | 11 + modules/home/zsh/default.nix | 2 + 24 files changed, 953 insertions(+), 346 deletions(-) delete mode 100644 modules/home/hyprland/pyprland.nix create mode 100644 modules/home/scripts/DropTerminal.nix create mode 100644 modules/home/scripts/hyprland-float-all.nix diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a1e129..76f1ef1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,33 @@ # 🚀 **Current Release - ZaneyOS v2.5.6** +#### 📅 **Updated: March 4th, 2026** + +- Fixed eval warnings + - for XORG name changes + - `nixfmt-rfc-style` moved to `nixfmt` + - ZSH `dotDir` change in Home Manager +- Ported `DropTerminal` from KoolDots + - Replaces pyprland +- Moved to unstable branch, v26.05 + - Recent upstream issues kept forcing me to patch to resolve + - Otherwise many large packages would build from source +- Fixed "Float All Windows" with Hyprland v0.54+ +- Remapped `legacy keybinds menu` binding to Quickshell menu +- Fixed windowrule for Picture-in-Picture +- `$modifier` was in wrong location in config file. + - It was in the `general{}` section needs to be outside +- Updated the Window Rules for the new format in Hyprland v0.53+ +- Removed the overlays and fixes needed when on Stable branch + #### 📅 **Updated: February 19th, 2026** -- Updated `zcli` GPU detection for newer AMD GPUs -- `nixvim.nix` Changes: - - Disabled Zig Language Server - - Wasn't using it - - Disabled Marksmand Language Server - - Caused dotnet libs to build from source (takes hours) +- Updated `zcli` GPU detection for newer AMD GPUs +- `nixvim.nix` Changes: + - Disabled Zig Language Server + - Wasn't using it + - Disabled Marksmand Language Server + - Caused dotnet libs to build from source (takes hours) #### 📅 **Updated: February 16th, 2026** diff --git a/FAQ.es.md b/FAQ.es.md index 3b2483c..d5f7079 100644 --- a/FAQ.es.md +++ b/FAQ.es.md @@ -164,7 +164,7 @@ fácil referencia. - `$modifier + C` → Ejecutar `hyprpicker -a` - `$modifier + G` → Abrir `GIMP` - `$modifier + V` → Mostrar historial de portapapeles vía `cliphist` -- `$modifier + T` → Alternar terminal con `pypr` +- `$modifier + Shift + T` → Alternar terminal desplegable con `DropTerminal` - `$modifier + M` → Abrir `pavucontrol` ## Gestión de Ventanas @@ -481,7 +481,7 @@ agrega tus paquetes. ncdu nvtopPackages.full oh-my-posh - pyprland + DropTerminal shellcheck multimarkdown nodejs_23 @@ -840,7 +840,7 @@ settings = { "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" - "pypr &" + "DropTerminal --spawn-only" #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; diff --git a/FAQ.md b/FAQ.md index b67e47c..5721910 100644 --- a/FAQ.md +++ b/FAQ.md @@ -160,7 +160,7 @@ Below are the keybindings for Hyprland, formatted for easy reference. - `$modifier + C` → Run `hyprpicker -a` - `$modifier + G` → Open `GIMP` - `$modifier + V` → Show clipboard history via `cliphist` -- `$modifier + T` → Toggle terminal with `pypr` +- `$modifier + Shift + T` → Toggle dropdown terminal with `DropTerminal` - `$modifier + M` → Open `pavucontrol` ## Window Management @@ -469,7 +469,7 @@ packages. ncdu nvtopPackages.full oh-my-posh - pyprland + DropTerminal shellcheck multimarkdown nodejs_23 @@ -826,7 +826,7 @@ settings = { "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" - "pypr &" + "DropTerminal --spawn-only" #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; @@ -1664,7 +1664,7 @@ packages. ncdu nvtopPackages.full oh-my-posh - pyprland + DropTerminal shellcheck multimarkdown nodejs_23 @@ -2017,7 +2017,7 @@ settings = { "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" - "pypr &" + "DropTerminal --spawn-only" #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; diff --git a/README.es.md b/README.es.md index 799300d..44b2f4a 100644 --- a/README.es.md +++ b/README.es.md @@ -139,7 +139,7 @@ A continuación los atajos de Hyprland, en formato de referencia rápida. La col - `$modifier + O` → Lanzar `OBS Studio` - `$modifier + Alt + C` → Selector de color - `$modifier + G` → Abrir `GIMP` -- `$modifier + T` → Alternar terminal con `pypr` +- `$modifier + Shift + T` → Alternar terminal desplegable con `DropTerminal` - `$modifier + Alt + M` → Abrir `pavucontrol` ### Gestión de ventanas diff --git a/README.md b/README.md index d39af24..84f5b15 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ when `barChoice = "noctalia"`). - `$modifier + O` → Launch `OBS Studio` - `$modifier + Alt + C` → Color Picker - `$modifier + G` → Open `GIMP` -- `$modifier + T` → Toggle terminal with `pypr` +- `$modifier + Shift + T` → Toggle dropdown terminal with `DropTerminal` - `$modifier + Alt + M` → Open `pavucontrol` ### Window Management diff --git a/cheatsheets/hyprland-customization-guide.es.md b/cheatsheets/hyprland-customization-guide.es.md index 74c7605..ff55d44 100644 --- a/cheatsheets/hyprland-customization-guide.es.md +++ b/cheatsheets/hyprland-customization-guide.es.md @@ -50,7 +50,7 @@ Ejemplo: Añadir copyq al inicio # ... exec-once = [ # ... - "pypr &" + "DropTerminal --spawn-only" "copyq" ]; # ... diff --git a/cheatsheets/hyprland-customization-guide.md b/cheatsheets/hyprland-customization-guide.md index 481b8f9..5f46f68 100644 --- a/cheatsheets/hyprland-customization-guide.md +++ b/cheatsheets/hyprland-customization-guide.md @@ -50,7 +50,7 @@ Example: Add copyq to autostart # ... exec-once = [ # ... - "pypr &" + "DropTerminal --spawn-only" "copyq" ]; # ... diff --git a/cheatsheets/hyprland/hyprland-customization-guide.es.md b/cheatsheets/hyprland/hyprland-customization-guide.es.md index 920efa5..ec11f21 100644 --- a/cheatsheets/hyprland/hyprland-customization-guide.es.md +++ b/cheatsheets/hyprland/hyprland-customization-guide.es.md @@ -50,7 +50,7 @@ Lista de aplicaciones/comandos que se lanzan al iniciar Hyprland. # ... exec-once = [ # ... - "pypr &" # pyprland para terminal desplegable SUPERSHIFT + T + "DropTerminal --spawn-only" # precarga terminal desplegable (Super+Shift+T) "copyq" ]; # ... diff --git a/cheatsheets/hyprland/hyprland-customization-guide.md b/cheatsheets/hyprland/hyprland-customization-guide.md index c226428..3ad10f3 100644 --- a/cheatsheets/hyprland/hyprland-customization-guide.md +++ b/cheatsheets/hyprland/hyprland-customization-guide.md @@ -72,7 +72,7 @@ If you want to start the `copyq` application every time you log in, you can add # ... exec-once = [ # ... - "pypr &" # pyprland for drop down term SUPERSHIFT + T + "DropTerminal --spawn-only" # preload dropdown terminal (Super+Shift+T) ]; # ... ``` @@ -83,7 +83,7 @@ If you want to start the `copyq` application every time you log in, you can add # ... exec-once = [ # ... - "pypr &" # pyprland for drop down term SUPERSHIFT + T + "DropTerminal --spawn-only" # preload dropdown terminal (Super+Shift+T) "copyq" ]; # ... diff --git a/flake.lock b/flake.lock index d9565fa..5d4d2cf 100644 --- a/flake.lock +++ b/flake.lock @@ -129,11 +129,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -202,24 +202,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -262,16 +244,16 @@ ] }, "locked": { - "lastModified": 1772380125, - "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", + "lastModified": 1772633327, + "narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=", "owner": "nix-community", "repo": "home-manager", - "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", + "rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -284,11 +266,11 @@ ] }, "locked": { - "lastModified": 1771756436, - "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", + "lastModified": 1772330611, + "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", + "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", "type": "github" }, "original": { @@ -297,34 +279,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "mnw": { "locked": { "lastModified": 1770419553, @@ -379,38 +333,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1772598333, - "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1768649915, - "narHash": "sha256-jc21hKogFnxU7KXSVTRmxC7u5D4RHwm9BAvDf5/Z1Uo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3e3f3c7f9977dc123c23ee21e8085ed63daf8c37", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { "locked": { "lastModified": 1772542754, "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", @@ -432,22 +354,20 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", "systems": [ "systems" ] }, "locked": { - "lastModified": 1769049374, - "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", + "lastModified": 1772402258, + "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=", "owner": "nix-community", "repo": "nixvim", - "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", + "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-25.11", "repo": "nixvim", "type": "github" } @@ -460,11 +380,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772589145, - "narHash": "sha256-p4Top4gFt0K78xkPdsJVhljeiE91hyAUzD3x5xZZ88A=", + "lastModified": 1772659442, + "narHash": "sha256-F1oSoSwGvBiqtSfGU9YzsjL9sP6IQDYQeUIQbXma70U=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "92161fa136ec7fd135fad9c23616066f6bfc6e66", + "rev": "c56fa106b7d8c6ae3034ce6d706bc35432ac9ea6", "type": "github" }, "original": { @@ -506,11 +426,11 @@ ] }, "locked": { - "lastModified": 1767886815, - "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -519,29 +439,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768249818, - "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=", - "owner": "NuschtOS", - "repo": "search", - "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "nvf": { "inputs": { "flake-compat": "flake-compat", @@ -556,11 +453,11 @@ ] }, "locked": { - "lastModified": 1772567589, - "narHash": "sha256-PvIjrYbD2HDj78mWnkEodXeHyeNe9oUS68PTzqbOtH4=", + "lastModified": 1772651509, + "narHash": "sha256-1ebULhLszxw6dMK0BYQTk1mLG6vdpGBUThVv+0/lFrE=", "owner": "notashelf", "repo": "nvf", - "rev": "6dba3fd0a7bb4fbeb0f55adb4840d620b77275cf", + "rev": "ce82d185882929babb294b39342009f8e1e0575a", "type": "github" }, "original": { @@ -575,13 +472,11 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "noctalia": "noctalia", "nvf": "nvf", "stylix": "stylix", - "systems": "systems_3", + "systems": "systems_2", "zen-browser": "zen-browser" } }, @@ -608,16 +503,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1771788390, - "narHash": "sha256-RzBpBwn93GWxLjacTte+ngwwg0L/BVOg4G/sSIeK3Rw=", + "lastModified": 1772296853, + "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", "owner": "danth", "repo": "stylix", - "rev": "ebb238f14d6f930068be4718472da3105fd5d3bf", + "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", "type": "github" }, "original": { "owner": "danth", - "ref": "release-25.11", + "ref": "master", "repo": "stylix", "type": "github" } @@ -638,21 +533,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -703,11 +583,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767817087, - "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "bd99656235aab343e3d597bf196df9bc67429507", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -756,11 +636,11 @@ ] }, "locked": { - "lastModified": 1772317412, - "narHash": "sha256-K2nKL/oUEPMGvJrQl6uHEu8BWt/Ss/tGJaA1omBGTUc=", + "lastModified": 1772638901, + "narHash": "sha256-kzAyU054Mzpnzgx475MgmcjYJXxXWQWBG7LLsYtHXKw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6678377209685f3987864355bdc3d14288cfc72d", + "rev": "75de12ddd50616a3628499ec18b648bceb88eb0d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 63ff269..cac001d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,19 +4,17 @@ inputs = { systems.url = "github:nix-systems/default-linux"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/release-25.05"; + 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/release-25.11"; + url = "github:danth/stylix/master"; inputs.nixpkgs.follows = "nixpkgs"; inputs.systems.follows = "systems"; }; @@ -29,7 +27,7 @@ # Checking nixvim to see if it's better nixvim = { - url = "github:nix-community/nixvim/nixos-25.11"; + url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; inputs.systems.follows = "systems"; }; diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index bd38129..f2d25f9 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -3,19 +3,6 @@ # Provide pkgs.google-antigravity via antigravity-nix overlay inputs.antigravity-nix.overlays.default - # pkgs.unstable overlay for bleeding edge applications - (_final: prev: { - unstable = import inputs.nixpkgs-unstable { - inherit (prev.stdenv.hostPlatform) system; - config.allowUnfree = true; - }; - }) - # Prefer stable mpv-with-scripts and yt-dlp to avoid deno source builds - (final: _prev: { - mpv-with-scripts = inputs.nixpkgs-stable.legacyPackages.${final.stdenv.hostPlatform.system}.mpv-with-scripts; - yt-dlp = inputs.nixpkgs-stable.legacyPackages.${final.stdenv.hostPlatform.system}.yt-dlp; - }) - # Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk (_final: prev: { xfce = prev.xfce // { diff --git a/modules/core/packages.nix b/modules/core/packages.nix index f20a753..9288d57 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -18,9 +18,6 @@ ] else []; - # bleeding edge packages from nixpkgs-unstable - unstablePkgs = with pkgs.unstable; [ - ]; in { programs = { neovim = { @@ -47,7 +44,6 @@ in { environment.systemPackages = with pkgs; noctaliaPkgs - ++ unstablePkgs ++ [ alejandra # nix formatter amfora # Fancy Terminal Browser For Gemini Protocol @@ -82,7 +78,7 @@ in { mdcat # CLI markdown parser mpv # Incredible Video Player ncdu # Disk Usage Analyzer With Ncurses Interface - nixfmt-rfc-style # Nix Formatter + nixfmt # Nix Formatter nwg-displays # configure monitor configs via GUI nwg-drawer # Application launcher for wayland nwg-dock-hyprland # Dock for hyprland diff --git a/modules/core/system.nix b/modules/core/system.nix index 3cabb73..a2a98c2 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -6,10 +6,6 @@ inherit (config.zaneyos) consoleKeyMap; in { nix = { - registry = { - # allow `nix run unstable#package` in terminal - unstable.flake = inputs.nixpkgs-unstable; - }; settings = { download-buffer-size = 200000000; auto-optimise-store = true; diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 995f8df..2906150 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -52,7 +52,7 @@ in { # ============= APPLICATION LAUNCHERS ============= "$modifier,K, Keybinds Search Tool, exec, qs-keybinds" "$modifier CTRL,C, Cheatsheets Viewer, exec, qs-cheatsheets" - "$modifier SHIFT,K, Legacy Keybinds Menu, exec, list-keybinds" + "$modifier SHIFT,K, Keybinds Search Tool, exec, qs-keybinds" "$modifier SHIFT,D, Discord, exec, discord" "$modifier ALT,W, Web Search, exec, web-search" "$modifier SHIFT,W, QS Wallpaper Setter, exec, qs-wallpapers-apply" @@ -68,7 +68,7 @@ in { "$modifier,O, OBS Studio, exec, obs" "$modifier ALT,C, Color Picker, exec, hyprpicker -a" "$modifier,G, GIMP, exec, gimp" - "$modifier shift,T, Dropdown Terminal, exec, pypr toggle term" + "$modifier shift,T, Dropdown Terminal, exec, sh -lc 'DropTerminal \${TERM:-kitty}'" "$modifier,T, Thunar, exec, thunar" "$modifier ALT,M, Audio Control, exec, pavucontrol" # ============= WINDOW MANAGEMENT ============= @@ -77,7 +77,7 @@ in { "$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit" "$modifier,F, Maximize, fullscreen," "$modifier SHIFT,F, Toggle Floating, togglefloating," - "$modifier ALT,F, Float All Windows, workspaceopt, allfloat" + "$modifier ALT,F, Float All Windows, exec, hyprland-float-all" "$modifier SHIFT,C, Exit/Logout of Hyprland, exit," # ============= WINDOW MOVEMENT (ARROW KEYS) ============= "$modifier SHIFT,left, Move Left, movewindow, l" diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index 14a53ed..aead275 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -9,7 +9,6 @@ in { ./hypridle.nix ./hyprland.nix ./hyprlock.nix - ./pyprland.nix ./windowrules.nix ]; } diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index e0af656..ee6c3a6 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -107,8 +107,8 @@ in { workspace_swipe_forever = true; }; + "$modifier" = "SUPER"; general = { - "$modifier" = "SUPER"; layout = "dwindle"; gaps_in = 6; gaps_out = 8; diff --git a/modules/home/hyprland/pyprland.nix b/modules/home/hyprland/pyprland.nix deleted file mode 100644 index 0bffe11..0000000 --- a/modules/home/hyprland/pyprland.nix +++ /dev/null @@ -1,18 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [pyprland]; - - home.file.".config/hypr/pyprland.toml".text = '' - [pyprland] - plugins = [ - "scratchpads", - ] - - [scratchpads.term] - animation = "fromTop" - command = "kitty --class kitty-dropterm" - class = "kitty-dropterm" - size = "70% 70%" - max_size = "1920px 100%" - position = "150px 150px" - ''; -} diff --git a/modules/home/hyprland/windowrules.nix b/modules/home/hyprland/windowrules.nix index 7db4942..be4fc9a 100644 --- a/modules/home/hyprland/windowrules.nix +++ b/modules/home/hyprland/windowrules.nix @@ -1,125 +1,436 @@ _: { wayland.windowManager.hyprland = { - settings = { - windowrule = [ - #"noblur, xwayland:1" # Helps prevent odd borders/shadows for xwayland apps - # downside it can impact other xwayland apps - # This rule is a template for a more targeted approach - "noblur, class:^(\bresolve\b)$, xwayland:1" # Window rule for just resolve - "tag +file-manager, class:^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$" - "tag +terminal, class:^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm)$" - "tag +browser, class:^(Brave-browser(-beta|-dev|-unstable)?)$" - "tag +browser, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$" - "tag +browser, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$" - "tag +browser, class:^([Tt]horium-browser|[Cc]achy-browser)$" - "tag +projects, class:^(codium|codium-url-handler|VSCodium)$" - "tag +projects, class:^(VSCode|code-url-handler)$" - "tag +im, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$" - "tag +im, class:^([Ff]erdium)$" - "tag +im, class:^([Ww]hatsapp-for-linux)$" - "tag +im, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$" - "tag +im, class:^(teams-for-linux)$" - "tag +games, class:^(gamescope)$" - "tag +games, class:^(steam_app_\d+)$" - "tag +gamestore, class:^([Ss]team)$" - "tag +gamestore, title:^([Ll]utris)$" - "tag +gamestore, class:^(com.heroicgameslauncher.hgl)$" - "tag +settings, class:^(gnome-disks|wihotspot(-gui)?)$" - "tag +settings, class:^([Rr]ofi)$" - "tag +settings, class:^(file-roller|org.gnome.FileRoller)$" - "tag +settings, class:^(nm-applet|nm-connection-editor|blueman-manager)$" - "tag +settings, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$" - "tag +settings, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$" - "tag +settings, class:(xdg-desktop-portal-gtk)" - "tag +settings, class:(.blueman-manager-wrapped)" - "tag +settings, class:(nwg-displays)" - "move 72% 7%,title:^(Picture-in-Picture)$" - # qs-keybinds floating viewer - "float, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" - "center, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" - "size 55% 66%, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" - # qs-cheatsheets floating viewer - "float, title:^(Cheatsheets Viewer)$" - "center, title:^(Cheatsheets Viewer)$" - "size 65% 60%, title:^(Cheatsheets Viewer)$" - "center, class:^([Ff]erdium)$" - "float, class:^([Ww]aypaper)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "center, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "center, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "center, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - # qs-keybinds, qs-docs, qs-chevron floating viewer - "float, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" - "center, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" - "size 55% 66%, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" - "center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$" - "center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)" - "center, title:^(Authentication Required)$" - "idleinhibit fullscreen, class:^(*)$" - "idleinhibit fullscreen, title:^(*)$" - "idleinhibit fullscreen, fullscreen:1" - "float, tag:settings*" - "float, class:^([Ff]erdium)$" - "float, title:^(Picture-in-Picture)$" - "float, class:^(mpv|com.github.rafostar.Clapper)$" - "float, title:^(Authentication Required)$" - "float, class:(codium|codium-url-handler|VSCodium), title:negative:(.*codium.*|.*VSCodium.*)" - "float, class:^(com.heroicgameslauncher.hgl)$, title:negative:(Heroic Games Launcher)" - "float, class:^([Ss]team)$, title:negative:^([Ss]team)$" - "float, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)" - "float, initialTitle:(Add Folder to Workspace)" - "float, initialTitle:(Open Files)" - "float, initialTitle:(wants to save)" - "size 70% 60%, initialTitle:(Open Files)" - "size 70% 60%, initialTitle:(Add Folder to Workspace)" - "size 70% 70%, tag:settings*" - "size 60% 70%, class:^([Ff]erdium)$" - "opacity 1.0 1.0, tag:browser*" - "opacity 0.9 0.8, tag:projects*" - "opacity 0.94 0.86, tag:im*" - "opacity 0.9 0.8, tag:file-manager*" - "opacity 0.8 0.7, tag:terminal*" - "opacity 0.8 0.7, tag:settings*" - "opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$" - "opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui" - "opacity 0.95 0.75, title:^(Picture-in-Picture)$" - "pin, title:^(Picture-in-Picture)$" - "keepaspectratio, title:^(Picture-in-Picture)$" - "noblur, tag:games*" - "fullscreen, tag:games*" - ]; - windowrulev2 = [ - # qs-wallpapers styling via compositor - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" + extraConfig = '' + # Set float and centering for dialog boxes + rule = float(true), match:modal:1 + rule = center(true), match:modal:1 - # qs-vid-wallpapers styling via compositor - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" + windowrule { + name = Resolve + match:class = ^(\bresolve\b)$ + match:xwayland = 1 + no_blur = on + } - # qs-wlogout styling via compositor - power menu overlay - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "rounding 20, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "opacity 1.0 1.0, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" + windowrule { + name = Thunar + match:class = ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$ + tag = +file-manager + } - # qs-docs / qs-cheatsheets overlay windows - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" - ]; - }; + windowrule { + name = Terminals + match:class = ^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm|dropterminal)$ + tag = +terminal + } + + windowrule { + name = Brave-browser + match:class = ^(Brave-browser(-beta|-dev|-unstable)?)$ + tag = +browser + } + + windowrule { + name = Firefox + match:class = ^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$ + tag = +browser + } + + windowrule { + name = Google-chrome + match:class = ^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$ + tag = +browser + } + + windowrule { + name = Thorium-browser + match:class = ^([Tt]horium-browser|[Cc]achy-browser)$ + tag = +browser + } + + windowrule { + name = vscodium + match:class = ^(codium|codium-url-handler|VSCodium)$ + tag = +projects + } + + windowrule { + name = vscode + match:class = ^(VSCode|code-url-handler)$ + tag = +projects + } + + windowrule { + name = Discord + match:class = ^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$ + tag = +im + } + + windowrule { + name = Ferdium + match:class = ^([Ff]erdium)$ + center = on + float = on + size = 60% = 70% + tag = +im + } + + windowrule { + name = Whatsapp + match:class = ^([Ww]hatsapp-for-linux)$ + tag = +im + } + + windowrule { + name = Telegram-desktop + match:class = ^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$ + tag = +im + } + + windowrule { + name = teams-for-linux + match:class = ^(teams-for-linux)$ + tag = +im + } + + windowrule { + name = gamescope + match:class = ^(gamescope)$ + tag = +games + } + + windowrule { + name = steam-app + match:class = ^(steam_app\d+)$ + tag = +games + } + + windowrule { + name = Steam + match:class = ^([Ss]team)$ + tag = +gamestore + } + + windowrule { + name = Lutris + match:title = ^([Ll]utris)$ + tag = +gamestore + } + + windowrule { + name = heroicgameslauncher + match:class = ^(com.heroicgameslauncher.hgl)$ + tag = +gamestore + } + + windowrule { + name = gnome-disks + match:class = ^(gnome-disks|wihotspot(-gui)?)$ + tag = +settings + } + + windowrule { + name = rofi + match:class = ^([Rr]ofi)$ + tag = +settings + no_blur = off + } + + windowrule { + name = FileRoller + match:class = ^(file-roller|org.gnome.FileRoller)$ + tag = +settings + } + + windowrule { + name = NetworkManger + match:class = ^(nm-applet|nm-connection-editor|blueman-manager)$ + tag = +settings + } + + windowrule { + name = PlusAudio + match:class = ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$ + center = on + tag = +settings + no_blur = off + } + + windowrule { + name = nwg-look + match:class = ^(nwg-look|qt5ct|qt6ct|[Yy]ad)$ + tag = +settings + } + + windowrule { + name = xdg-desktop-portal-gtk + match:class = (xdg-desktop-portal-gtk) + tag = +settings + } + + windowrule { + name = blueman + match:class = (.blueman-manager-wrapped) + tag = +settings + } + + windowrule { + name = nwg-displays + match:class = (nwg-displays) + tag = +settings + } + + windowrule { + name = Picture-in-Picture + match:title = ^(Picture-in-Picture)$ + float = on + move = 72% = 7% + opacity = 0.95 = 0.75 + pin = 0 + keep_aspect_ratio = on + } + + windowrule { + name = ThunarFileMgr + match:class = ([Tt]hunar) + match:title = negative:(.*[Tt]hunar.*) + center = on + float = on + } + + windowrule { + name = Authentication-Required + match:title = ^(Authentication Required)$ + center = on + float = on + } + + windowrule { + name = IdleInhibit-fullscreen-1 + match:class = ^(*)$ + idle_inhibit = fullscreen + } + + windowrule { + name = IdleInhibit-fullscreen-2 + match:title = ^(*)$ + idle_inhibit = fullscreen + } + + windowrule { + name = IdleInhibit-fullscreen-3 + match:fullscreen = 1 + idle_inhibit = fullscreen + } + + windowrule { + name = Settings-Tag + match:tag = settings* + float = on + opacity = 0.8 = 0.7 + size = 70% = 70% + no_blur = off + } + + windowrule { + name = WayPaper + match:class = ^([Ww]aypaper)$ + float = on + no_blur = off + } + + windowrule { + name = mpv-or-clapper + match:class = ^(mpv|com.github.rafostar.Clapper)$ + float = on + } + + windowrule { + name = codium-url-handler + match:class = (codium|codium-url-handler|VSCodium) + match:title = negative:(.*codium.*|.*VSCodium.*) + float = on + } + + windowrule { + name = heroicgameslauncher-1 + match:class = ^(com.heroicgameslauncher.hgl)$ + match:title = negative:(Heroic Games Launcher) + float = on + } + + windowrule { + name = Steam + match:class = ^([Ss]team)$ + match:title = negative:^([Ss]team)$ + float = on + } + + windowrule { + name = Add-Folder + match:initial_title = (Add Folder to Workspace) + float = on + size = 70% = 60% + } + + windowrule { + name = Open-File + match:initial_title = (Open Files) + float = on + size = 70% = 60% + } + + windowrule { + name = Wants-to-Save + match:initial_title = (wants to save) + float = on + } + + windowrule { + name = Browsers + match:tag = browser* + opacity = 1.0 = 1.0 + } + + windowrule { + name = Projects + match:tag = projects* + opacity = 0.9 = 0.8 + } + + windowrule { + name = Instant-Messaging + match:tag = im* + opacity = 0.94 = 0.86 + } + + windowrule { + name = File-Managers + match:tag = file-manager* + opacity = 0.9 = 0.8 + } + + windowrule { + name = Terminals-opacity + match:tag = terminal* + opacity = 0.8 = 0.7 + no_blur = off + } + + windowrule { + name = windowrule-77 + match:class = ^(gedit|org.gnome.TextEditor|mousepad)$ + opacity = 0.8 = 0.7 + } + + windowrule { + name = windowrule-78 + match:class = ^(seahorse)$ + opacity = 0.9 = 0.8 + } + + windowrule { + name = windowrule-79 + match:tag = games* + no_blur = on + } + + windowrule { + name = windowrule-80 + match:tag = games* + fullscreen = on + } + + windowrule { + name = qs-keybinds + match:title = ^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$ + float = on + center = on + size = 55% = 66% + } + + windowrule { + name = qs-cheatsheets + match:title = ^(Cheatsheets Viewer)$ + float = on + center = on + size = 65% = 60% + } + + windowrule { + name = qs-extended-viewers + match:title = ^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$ + float = on + center = on + size = 55% = 66% + } + + windowrule { + name = QS-Wallpapers + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Wallpapers)$ + border_size = 0 + float = on + no_blur = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QA-Video-Wallpapers + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Video Wallpapers)$ + border_size = 0 + center = on + float = on + no_blur = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QS-wlogout + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(qs-wlogout)$ + border_size = 0 + center = on + float = on + opacity = 1.0 = 1.0 + rounding = 20 + } + + windowrule { + name = QA-Panels + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Panels)$ + center = on + float = on + no_blur = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QS-Cheatsheets + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Cheatsheets Viewer)$ + border_size = 0 + center = on + float = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QS-Documentation-Viewer + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Documentation Viewer)$ + border_size = 0 + center = on + float = on + no_shadow = on + rounding = 12 + } + ''; }; } diff --git a/modules/home/scripts/DropTerminal.nix b/modules/home/scripts/DropTerminal.nix new file mode 100644 index 0000000..7ec5b49 --- /dev/null +++ b/modules/home/scripts/DropTerminal.nix @@ -0,0 +1,414 @@ +{pkgs}: +pkgs.writeShellScriptBin "DropTerminal" '' + #!/usr/bin/env bash + # Dropdown Terminal for Hyprland (Nix-managed) + # Source: adapted from Dropterminal.sh by Kiran George (SherLock707) + # Usage: + # DropTerminal [-d] [] + # Behavior: + # - If is omitted, uses $TERM, with fallback to kitty when $TERM is unset/empty + + set -euo pipefail + + DEBUG=false + # Use a dedicated special workspace so preload never flashes on screen + SPECIAL_WS="special:dropterminal" + ADDR_FILE="/tmp/dropdown_terminal_addr" + SPAWN_ONLY=false # if true, just create hidden in scratchpad and exit + + # Sanitize Hyprland JSON to strict JSON (work around NaN/Inf issues) + hyprjson() { + # Usage: hyprjson + # Emits strict JSON, replacing invalid numeric literals with null + hyprctl "$@" -j 2>/dev/null | sed -E 's/: *nan([,}])/ : null\1/gi; s/: *-nan([,}])/ : null\1/gi; s/: *inf([,}])/ : null\1/gi; s/: *-inf([,}])/ : null\1/gi' + } + + # Dropdown size and position configuration (percentages) + WIDTH_PERCENT=65 # Width as percentage of screen width + HEIGHT_PERCENT=65 # Height as percentage of screen height + Y_PERCENT=10 # Y position as percentage from top (X is auto-centered) + + # Animation settings + ANIMATION_DURATION=100 # milliseconds + SLIDE_STEPS=5 + SLIDE_DELAY=5 # milliseconds between steps + + # Parse arguments + if [ "''${1-}" = "-d" ] || [ "''${1-}" = "--debug" ]; then + DEBUG=true + shift || true + fi + if [ "''${1-}" = "-S" ] || [ "''${1-}" = "--spawn-only" ]; then + SPAWN_ONLY=true + shift || true + fi + # Env override for startup usage + if [ "''${DROPTERM_SPAWN_ONLY-}" = "1" ]; then + SPAWN_ONLY=true + fi + + # Terminal command: prefer explicit arg; otherwise always use kitty + TERMINAL_CMD="''${1-}" + if [ -z "''${TERMINAL_CMD}" ]; then + TERMINAL_CMD="kitty" + fi + + # Debug echo function + debug_echo() { + if [ "$DEBUG" = true ]; then + echo "$@" + fi + } + + # Wait until Hyprland returns sane JSON (monitors/workspace ready) + wait_for_hypr() { + for i in $(seq 1 60); do + if hyprjson monitors | ${pkgs.jq}/bin/jq -e 'length > 0' >/dev/null 2>&1 \ + && hyprjson activeworkspace | ${pkgs.jq}/bin/jq -e '.id | numbers' >/dev/null 2>&1; then + return 0 + fi + sleep 0.05 + done + return 0 + } + + # Function to get window geometry + get_window_geometry() { + local addr="$1" + hyprjson clients | ${pkgs.jq}/bin/jq -r --arg ADDR "$addr" '.[] | select(.address == $ADDR) | "\(.at[0]) \(.at[1]) \(.size[0]) \(.size[1])"' + } + + # Ensure a window is floating + ensure_floating() { + local addr="$1" + local is_float=$(hyprjson clients | ${pkgs.jq}/bin/jq -r --arg ADDR "$addr" '.[] | select(.address == $ADDR) | .floating // false') + if [ "$is_float" != "true" ]; then + hyprctl dispatch togglefloating "address:$addr" >/dev/null 2>&1 || true + sleep 0.02 + fi + } + + # Function to animate window slide down (show) + animate_slide_down() { + local addr="$1" + local target_x="$2" + local target_y="$3" + local width="$4" + local height="$5" + + debug_echo "Animating slide down for window $addr to position $target_x,$target_y" + + # Start position (above screen) + local start_y=$((target_y - height - 50)) + + # Calculate step size + local step_y=$(((target_y - start_y) / SLIDE_STEPS)) + + # Move window to start position instantly (off-screen) + hyprctl dispatch movewindowpixel "exact $target_x $start_y,address:$addr" >/dev/null 2>&1 + sleep 0.05 + + # Animate slide down + for i in $(seq 1 $SLIDE_STEPS); do + local current_y=$((start_y + (step_y * i))) + hyprctl dispatch movewindowpixel "exact $target_x $current_y,address:$addr" >/dev/null 2>&1 + sleep 0.03 + done + + # Ensure final position is exact + hyprctl dispatch movewindowpixel "exact $target_x $target_y,address:$addr" >/dev/null 2>&1 + } + + # Function to animate window slide up (hide) + animate_slide_up() { + local addr="$1" + local start_x="$2" + local start_y="$3" + local width="$4" + local height="$5" + + debug_echo "Animating slide up for window $addr from position $start_x,$start_y" + + # End position (above screen) + local end_y=$((start_y - height - 50)) + + # Calculate step size + local step_y=$(((start_y - end_y) / SLIDE_STEPS)) + + # Animate slide up + for i in $(seq 1 $SLIDE_STEPS); do + local current_y=$((start_y - (step_y * i))) + hyprctl dispatch movewindowpixel "exact $start_x $current_y,address:$addr" >/dev/null 2>&1 + sleep 0.03 + done + + debug_echo "Slide up animation completed" + } + + # Function to get monitor info including scale and name of focused monitor + get_monitor_info() { + local monitor_data=$(hyprjson monitors | ${pkgs.jq}/bin/jq -r '.[] | select(.focused == true) | "\(.x) \(.y) \(.width) \(.height) \(.scale // 1) \(.name)"') + if [ -z "$monitor_data" ] || [[ "$monitor_data" =~ ^null ]]; then + debug_echo "Error: Could not get focused monitor information" + return 1 + fi + echo "$monitor_data" + } + + # Function to calculate dropdown position with proper scaling and centering + calculate_dropdown_position() { + local monitor_info=$(get_monitor_info) + + if [ $? -ne 0 ] || [ -z "$monitor_info" ]; then + debug_echo "Error: Failed to get monitor info, using fallback values" + echo "100 100 800 600 fallback-monitor" + return 1 + fi + + local mon_x=$(echo $monitor_info | cut -d' ' -f1) + local mon_y=$(echo $monitor_info | cut -d' ' -f2) + local mon_width=$(echo $monitor_info | cut -d' ' -f3) + local mon_height=$(echo $monitor_info | cut -d' ' -f4) + local mon_scale=$(echo $monitor_info | cut -d' ' -f5) + local mon_name=$(echo $monitor_info | cut -d' ' -f6) + + debug_echo "Monitor info: x=$mon_x, y=$mon_y, width=$mon_width, height=$mon_height, scale=$mon_scale" + + # Validate scale value and provide fallback + if [ -z "$mon_scale" ] || [ "$mon_scale" = "null" ] || [ "$mon_scale" = "0" ]; then + debug_echo "Invalid scale value, using 1.0 as fallback" + mon_scale="1.0" + fi + + # Calculate logical dimensions by dividing physical dimensions by scale + local logical_width logical_height + if [ -x "${pkgs.bc}/bin/bc" ]; then + logical_width=$(echo "scale=0; $mon_width / $mon_scale" | ${pkgs.bc}/bin/bc | cut -d'.' -f1) + logical_height=$(echo "scale=0; $mon_height / $mon_scale" | ${pkgs.bc}/bin/bc | cut -d'.' -f1) + else + # Fallback to integer math (multiply by 100 for precision, then divide) + local scale_int=$(echo "$mon_scale" | sed 's/\.///' | sed 's/^0*//') + if [ -z "$scale_int" ]; then scale_int=100; fi + + logical_width=$(((mon_width * 100) / scale_int)) + logical_height=$(((mon_height * 100) / scale_int)) + fi + + # Ensure we have valid integer values + if ! [[ "$logical_width" =~ ^-?[0-9]+$ ]]; then logical_width=$mon_width; fi + if ! [[ "$logical_height" =~ ^-?[0-9]+$ ]]; then logical_height=$mon_height; fi + + debug_echo "Physical resolution: ''${mon_width}x''${mon_height}" + debug_echo "Logical resolution: ''${logical_width}x''${logical_height} (physical ÷ scale)" + + # Calculate window dimensions based on LOGICAL space percentages + local width=$((logical_width * WIDTH_PERCENT / 100)) + local height=$((logical_height * HEIGHT_PERCENT / 100)) + + # Calculate Y position from top based on percentage of LOGICAL height + local y_offset=$((logical_height * Y_PERCENT / 100)) + + # Calculate centered X position in LOGICAL space + local x_offset=$(((logical_width - width) / 2)) + + # Apply monitor offset to get final positions in logical coordinates + local final_x=$((mon_x + x_offset)) + local final_y=$((mon_y + y_offset)) + + debug_echo "Window size: ''${width}x''${height} (logical pixels)" + debug_echo "Final position: x=$final_x, y=$final_y (logical coordinates)" + debug_echo "Hyprland will scale these to physical coordinates automatically" + + echo "$final_x $final_y $width $height $mon_name" + } + + # Ensure Hyprland is ready and get the current workspace + wait_for_hypr + CURRENT_WS=$(hyprjson activeworkspace | ${pkgs.jq}/bin/jq -r '.id // empty') + if [ -z "''${CURRENT_WS}" ]; then + # Try once more after a short wait + sleep 0.1 + CURRENT_WS=$(hyprjson activeworkspace | ${pkgs.jq}/bin/jq -r '.id // empty') + fi + if [ -z "''${CURRENT_WS}" ]; then + debug_echo "Warning: unable to read active workspace; using workspace 1" + CURRENT_WS="1" + fi + + # Function to get stored terminal address + get_terminal_address() { + if [ -f "$ADDR_FILE" ] && [ -s "$ADDR_FILE" ]; then + cut -d' ' -f1 "$ADDR_FILE" + fi + } + + # Function to get stored monitor name + get_terminal_monitor() { + if [ -f "$ADDR_FILE" ] && [ -s "$ADDR_FILE" ]; then + cut -d' ' -f2- "$ADDR_FILE" + fi + } + + # Function to check if terminal exists + terminal_exists() { + local addr=$(get_terminal_address) + if [ -n "$addr" ]; then + hyprjson clients | ${pkgs.jq}/bin/jq -e --arg ADDR "$addr" 'map(select(.address == $ADDR)) | any' >/dev/null 2>&1 + else + return 1 + fi + } + + # Function to check if terminal is in special workspace + terminal_in_special() { + local addr=$(get_terminal_address) + if [ -n "$addr" ]; then + hyprjson clients | ${pkgs.jq}/bin/jq -e --arg ADDR "$addr" --arg WS "$SPECIAL_WS" 'map(select(.address == $ADDR and .workspace.name == $WS)) | any' >/dev/null 2>&1 + else + return 1 + fi + } + + # Function to spawn terminal and capture its address + spawn_terminal() { + debug_echo "Creating new dropdown terminal with command: $TERMINAL_CMD" + + # Calculate dropdown position for later use + local pos_info=$(calculate_dropdown_position) + if [ $? -ne 0 ]; then + debug_echo "Warning: Using fallback positioning" + fi + + local target_x=$(echo $pos_info | cut -d' ' -f1) + local target_y=$(echo $pos_info | cut -d' ' -f2) + local width=$(echo $pos_info | cut -d' ' -f3) + local height=$(echo $pos_info | cut -d' ' -f4) + local monitor_name=$(echo $pos_info | cut -d' ' -f5) + + debug_echo "Target position: ''${target_x},''${target_y}, size: ''${width}x''${height}" + + # Create a unique title so we can robustly identify the new window + local token=$(date +%s%N) + local title="dropterm-$token" + local spawn_cmd="$TERMINAL_CMD --class dropterminal --instance-group dropterminal --title $title" + + # Launch in scratchpad to avoid visible spawn; size will be enforced after detection + hyprctl dispatch exec "[float; workspace $SPECIAL_WS silent] $spawn_cmd" >/dev/null 2>&1 || true + + # Wait for the new window with our unique class/title (up to ~3s) + local new_addr="" + for i in $(seq 1 60); do + new_addr=$(hyprjson clients | ${pkgs.jq}/bin/jq -r --arg CLS "dropterminal" --arg TITLE "$title" \ + '.[] | select(.class == $CLS and .title == $TITLE) | .address' | head -1) + if [ -n "$new_addr" ]; then break; fi + sleep 0.05 + done + + if [ -n "$new_addr" ] && [ "$new_addr" != "null" ]; then + # Store the address and monitor name + echo "$new_addr $monitor_name" >"$ADDR_FILE" + debug_echo "Terminal created with address: $new_addr in special workspace on monitor $monitor_name" + + # Ensure scratchpad placement (in case exec flags were ignored) + hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$new_addr" >/dev/null 2>&1 || true + ensure_floating "$new_addr" + hyprctl dispatch resizewindowpixel "exact $width $height,address:$new_addr" >/dev/null 2>&1 || true + + if [ "$SPAWN_ONLY" = true ]; then + # Keep it hidden for startup preload + debug_echo "Spawn-only: leaving terminal hidden in scratchpad" + return 0 + fi + + # Bring to current workspace and set up geometry/animation + hyprctl dispatch movetoworkspacesilent "$CURRENT_WS,address:$new_addr" + ensure_floating "$new_addr" + hyprctl dispatch pin "address:$new_addr" + hyprctl dispatch resizewindowpixel "exact $width $height,address:$new_addr" + animate_slide_down "$new_addr" "$target_x" "$target_y" "$width" "$height" + + return 0 + fi + + debug_echo "Failed to detect new kitty window; aborting spawn" + return 1 + } + + # Main logic + if terminal_exists; then + TERMINAL_ADDR=$(get_terminal_address) + debug_echo "Found existing terminal: $TERMINAL_ADDR" + focused_monitor=$(get_monitor_info | awk '{print $6}') + dropdown_monitor=$(get_terminal_monitor) + if [ "$focused_monitor" != "$dropdown_monitor" ]; then + debug_echo "Monitor focus changed: moving dropdown to $focused_monitor" + # Calculate new position for focused monitor + pos_info=$(calculate_dropdown_position) + target_x=$(echo $pos_info | cut -d' ' -f1) + target_y=$(echo $pos_info | cut -d' ' -f2) + width=$(echo $pos_info | cut -d' ' -f3) + height=$(echo $pos_info | cut -d' ' -f4) + monitor_name=$(echo $pos_info | cut -d' ' -f5) + # Move and resize window + hyprctl dispatch movewindowpixel "exact $target_x $target_y,address:$TERMINAL_ADDR" + hyprctl dispatch resizewindowpixel "exact $width $height,address:$TERMINAL_ADDR" + # Update ADDR_FILE + echo "$TERMINAL_ADDR $monitor_name" >"$ADDR_FILE" + fi + + if terminal_in_special; then + debug_echo "Bringing terminal from scratchpad with slide down animation" + + # Calculate target position + pos_info=$(calculate_dropdown_position) + target_x=$(echo $pos_info | cut -d' ' -f1) + target_y=$(echo $pos_info | cut -d' ' -f2) + width=$(echo $pos_info | cut -d' ' -f3) + height=$(echo $pos_info | cut -d' ' -f4) + + # Use movetoworkspacesilent to avoid affecting workspace history + hyprctl dispatch movetoworkspacesilent "$CURRENT_WS,address:$TERMINAL_ADDR" + ensure_floating "$TERMINAL_ADDR" + hyprctl dispatch pin "address:$TERMINAL_ADDR" + + # Set size and animate slide down + hyprctl dispatch resizewindowpixel "exact $width $height,address:$TERMINAL_ADDR" + animate_slide_down "$TERMINAL_ADDR" "$target_x" "$target_y" "$width" "$height" + + hyprctl dispatch focuswindow "address:$TERMINAL_ADDR" + else + debug_echo "Hiding terminal to scratchpad with slide up animation" + + # Get current geometry for animation + geometry=$(get_window_geometry "$TERMINAL_ADDR") + if [ -n "$geometry" ]; then + curr_x=$(echo $geometry | cut -d' ' -f1) + curr_y=$(echo $geometry | cut -d' ' -f2) + curr_width=$(echo $geometry | cut -d' ' -f3) + curr_height=$(echo $geometry | cut -d' ' -f4) + + debug_echo "Current geometry: ''${curr_x},''${curr_y} ''${curr_width}x''${curr_height}" + + # Animate slide up first + animate_slide_up "$TERMINAL_ADDR" "$curr_x" "$curr_y" "$curr_width" "$curr_height" + + # Small delay then move to special workspace and unpin + sleep 0.1 + hyprctl dispatch pin "address:$TERMINAL_ADDR" # Unpin (toggle) + hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR" + else + debug_echo "Could not get window geometry, moving to scratchpad without animation" + hyprctl dispatch pin "address:$TERMINAL_ADDR" + hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR" + fi + fi + else + debug_echo "No existing terminal found, creating new one" + if spawn_terminal; then + TERMINAL_ADDR=$(get_terminal_address) + if [ "$SPAWN_ONLY" = false ] && [ -n "$TERMINAL_ADDR" ]; then + hyprctl dispatch focuswindow "address:$TERMINAL_ADDR" + fi + fi + fi +'' diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 8bbda94..8e14d94 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -17,6 +17,7 @@ (import ./screenshootin.nix {inherit pkgs;}) (import ./squirtle.nix {inherit pkgs;}) (import ./task-waybar.nix {inherit pkgs;}) + (import ./DropTerminal.nix {inherit pkgs;}) # Fastfetch wrappers (import ./ff.nix {inherit pkgs;}) (import ./ff1.nix {inherit pkgs;}) @@ -43,6 +44,7 @@ (import ./qs-wlogout.nix {inherit pkgs;}) (import ./qs-docs.nix {inherit pkgs;}) (import ./docs-parser.nix {inherit pkgs;}) + (import ./hyprland-float-all.nix {inherit pkgs;}) (import ./launch-nwg-menu.nix {inherit pkgs;}) (import ./hyprland-dock.nix {inherit pkgs;}) (import ./zcli.nix { @@ -53,4 +55,15 @@ ]; }) ]; + + xdg.desktopEntries.dropterminal = { + name = "Drop Terminal"; + comment = "Dropdown terminal (Hyprland)"; + exec = "DropTerminal"; + terminal = false; + type = "Application"; + icon = "kitty"; + settings.StartupWMClass = "dropterminal"; + categories = ["System" "Utility" "TerminalEmulator"]; + }; } diff --git a/modules/home/scripts/hyprland-dock.nix b/modules/home/scripts/hyprland-dock.nix index 60b4c9e..b287b78 100644 --- a/modules/home/scripts/hyprland-dock.nix +++ b/modules/home/scripts/hyprland-dock.nix @@ -18,9 +18,8 @@ pkgs.writeShellScriptBin "dock" '' MENU="nwg-drawer -mb 100 -mt 100 -ml 300 -mr 300" # Masked apps won't show in DOCK. - # I am running pyprland scratchpads - # They don't show up correctly so I mask it off - MASK_APPS="kitty-dropterm" + # Dropdown terminal doesn't show correctly in the dock, so mask it off + MASK_APPS="dropterminal" ICON_SIZE=32 MARGIN_BOTTOM=10 diff --git a/modules/home/scripts/hyprland-float-all.nix b/modules/home/scripts/hyprland-float-all.nix new file mode 100644 index 0000000..e99c30f --- /dev/null +++ b/modules/home/scripts/hyprland-float-all.nix @@ -0,0 +1,11 @@ +{pkgs}: +pkgs.writeShellScriptBin "hyprland-float-all" '' + #!/usr/bin/env bash + set -euo pipefail + + ws="$(${pkgs.hyprland}/bin/hyprctl activeworkspace -j | ${pkgs.jq}/bin/jq -r .id)" + ${pkgs.hyprland}/bin/hyprctl clients -j | ${pkgs.jq}/bin/jq -r --arg ws "$ws" '.[] | select(.workspace.id == ($ws|tonumber)) | .address' \ + | while read -r addr; do + [ -n "''${addr:-}" ] && ${pkgs.hyprland}/bin/hyprctl dispatch togglefloating "address:$addr" + done +'' diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix index 4f2284e..9c16a4f 100644 --- a/modules/home/zsh/default.nix +++ b/modules/home/zsh/default.nix @@ -1,6 +1,7 @@ { pkgs, lib, + config, zaneyos, ... }: let @@ -12,6 +13,7 @@ in { programs.zsh = { enable = true; + dotDir = config.home.homeDirectory; autosuggestion.enable = true; syntaxHighlighting = { enable = true; From 2654872867d83b8171bea74d6d0be6f2a5f7e1ec Mon Sep 17 00:00:00 2001 From: Don Williams Date: Wed, 4 Mar 2026 18:46:58 -0500 Subject: [PATCH 152/232] Added scrolling and monocle layouts - fixed SUPER J/K to be layout aware --- modules/home/hyprland/binds.nix | 8 +- modules/home/hyprland/exec-once.nix | 1 + modules/home/hyprland/hyprland.nix | 32 +++++-- modules/home/scripts/default.nix | 1 + .../home/scripts/hyprland-change-layout.nix | 85 ++++++++++++++++++ modules/home/swaync.nix | 2 + .../swaync/images/catppuccin-macchiato.png | Bin 0 -> 25926 bytes 7 files changed, 123 insertions(+), 6 deletions(-) create mode 100644 modules/home/scripts/hyprland-change-layout.nix create mode 100644 modules/home/swaync/images/catppuccin-macchiato.png diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 2906150..646951d 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -15,7 +15,7 @@ "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier CTRL,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockscreen lock" "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" @@ -78,6 +78,12 @@ in { "$modifier,F, Maximize, fullscreen," "$modifier SHIFT,F, Toggle Floating, togglefloating," "$modifier ALT,F, Float All Windows, exec, hyprland-float-all" + # ============= LAYOUTS ============= + "$modifier ALT,L, Toggle Layouts, exec, hyprland-change-layout toggle" + "$modifier ALT,1, Layout Dwindle, exec, hyprland-change-layout dwindle" + "$modifier ALT,2, Layout Master, exec, hyprland-change-layout master" + "$modifier ALT,3, Layout Scrolling, exec, hyprland-change-layout scrolling" + "$modifier ALT,4, Layout Monocle, exec, hyprland-change-layout monocle" "$modifier SHIFT,C, Exit/Logout of Hyprland, exit," # ============= WINDOW MOVEMENT (ARROW KEYS) ============= "$modifier SHIFT,left, Move Left, movewindow, l" diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index 3bd41b1..a0a6193 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -33,6 +33,7 @@ in { "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user start hyprpolkitagent" "qs -c overview" # Start quickshell-overview daemon + "hyprland-change-layout init" ] ++ noctaliaExec ++ waybarExec; }; diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index ee6c3a6..89507db 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -137,9 +137,15 @@ in { }; dwindle = { - pseudotile = true; + pseudotile = false; preserve_split = true; - force_split = 2; + smart_resizing = true; + use_active_for_splits = true; + smart_split = false; + default_split_ratio = 1.0; + split_bias = 0; + precise_mouse_move = false; + special_scale_factor = 0.8; }; decoration = { @@ -180,11 +186,27 @@ in { }; master = { - new_status = "master"; - new_on_top = 1; - mfact = 0.5; + new_status = "slave"; + new_on_top = false; + new_on_active = "none"; + orientation = "left"; + mfact = 0.55; + slave_count_for_center_master = 2; + center_master_fallback = "left"; + smart_resizing = true; + drop_at_cursor = true; + always_keep_position = false; }; + scrolling = { + column_width = 0.80; + fullscreen_on_one_column = true; + direction = "right"; + follow_focus = true; + }; + + monocle = {}; + # Ensure Xwayland windows render at integer scale; compositor scales them xwayland = { force_zero_scaling = true; diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 8e14d94..6a3f6bc 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -45,6 +45,7 @@ (import ./qs-docs.nix {inherit pkgs;}) (import ./docs-parser.nix {inherit pkgs;}) (import ./hyprland-float-all.nix {inherit pkgs;}) + (import ./hyprland-change-layout.nix {inherit pkgs;}) (import ./launch-nwg-menu.nix {inherit pkgs;}) (import ./hyprland-dock.nix {inherit pkgs;}) (import ./zcli.nix { diff --git a/modules/home/scripts/hyprland-change-layout.nix b/modules/home/scripts/hyprland-change-layout.nix new file mode 100644 index 0000000..0ce0e65 --- /dev/null +++ b/modules/home/scripts/hyprland-change-layout.nix @@ -0,0 +1,85 @@ +{pkgs}: +pkgs.writeShellScriptBin "hyprland-change-layout" '' + #!/usr/bin/env bash + set -euo pipefail + + notif="''${XDG_CONFIG_HOME:-$HOME/.config}/swaync/images/catppuccin-macchiato.png" + layouts=(dwindle master scrolling monocle) + + get_layout() { + ${pkgs.hyprland}/bin/hyprctl -j getoption general:layout | ${pkgs.jq}/bin/jq -r '.str' + } + + next_layout() { + local current="$1" + local i + for i in "''${!layouts[@]}"; do + if [[ "''${layouts[i]}" == "$current" ]]; then + echo "''${layouts[((i + 1) % ''${#layouts[@]})]}" + return + fi + done + echo "''${layouts[0]}" + } + + set_layout() { + local target="$1" + + ${pkgs.hyprland}/bin/hyprctl keyword general:layout "$target" + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,J || true + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,K || true + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,O || true + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER_SHIFT,M || true + + case "$target" in + "dwindle") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,O,layoutmsg,togglesplit + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Dwindle Layout" + ;; + "master") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Master Layout" + ;; + "scrolling") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Scrolling Layout" + ;; + "monocle") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER_SHIFT,M,layoutmsg,swapnext + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Monocle Layout" + ;; + *) + echo "Unknown layout: $target" >&2 + return 1 + ;; + esac + } + + current="$(get_layout)" + arg="''${1:-toggle}" + + case "$arg" in + init) + set_layout "$current" + ;; + toggle|next) + set_layout "$(next_layout "$current")" + ;; + set) + set_layout "''${2:-}" + ;; + master|dwindle|scrolling|monocle) + set_layout "$arg" + ;; + *) + echo "Usage: $(basename "$0") [toggle|next|init|set |master|dwindle|scrolling|monocle]" >&2 + exit 1 + ;; + esac +'' diff --git a/modules/home/swaync.nix b/modules/home/swaync.nix index 07e6261..a29959b 100644 --- a/modules/home/swaync.nix +++ b/modules/home/swaync.nix @@ -1,4 +1,6 @@ {config, ...}: { + home.file."${config.xdg.configHome}/swaync/images/catppuccin-macchiato.png".source = + ./swaync/images/catppuccin-macchiato.png; services.swaync = { enable = true; settings = { diff --git a/modules/home/swaync/images/catppuccin-macchiato.png b/modules/home/swaync/images/catppuccin-macchiato.png new file mode 100644 index 0000000000000000000000000000000000000000..ddb8cd643c21cc31c53d9dd31e976de2e605f313 GIT binary patch literal 25926 zcmeAS@N?(olHy`uVBq!ia0y~yV3-EN0&ENn3^^0mE@WU}P)PO&@?~JCQe$9fXklRZ z#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7}%1$-Ca~v)YYx5Hq~z3#K6G7S>O>_ z%)r310gNYTiyJU7r0nu^aSW-r^>%K0g2>hD?enY6_qI>CAQaW$Ak`vO^?q*$D~s!f z28}YuzyKEOj)oh7flGuHzTB%;Sm^vhQDuTd)!pj*{JXht#4&De`*HvI>6A3};`DcC z=Inf0eopY}Dppq0%tfYVIX5;G&R6dK&60CtL*iq(uo37t1UOY^V40q$hFIFE+UHaSXedvXkuMaxklV;nu^>1=^ z4ZoH9-!*?6D;|2Q9*F+YspX(~Dwy@dLY+`Y6T$l@o)s)PwT{)B|IoHyf%>)cn715R zkj}_>Wr3q%%yPHIj%!0DPjP0=&0HL1$K{*NBWG?P^~Bl8uS)EA*gYxX@-7nD|g4zMVmBub;Lwl#5-6IZK<92LC{Yj%B$I@ z_09ZC=a%o~JZ)EF{`4=)j!Q3(Y`X00V3(Pp?aZjmDiX0#uE;}KwxoXUs?Q4^-ut)w zw;k)(pkHQhXL9b^ZMArEL(Qg>hV%Uu3tB7AF|aA zz1Q-R+>h3DOugNBGDBp+&zpNfe#xjcFK9SFv(GxD()`Kcw9^lkd^~V;>+FZ87Jk;3 zv18k`JSJCyOF~oSfBYW5&52_7xfY*j=w8h4+f~i8>DLky-`=)O3mqe`{%+D+zvznL zg`YhSm@YJ$@G;+%N#Q7H^e%NynE}9PYW58qaMyNBga!Uppj$+gUXGN!7!=Fw-~mg~9GE|*I$VNsiB@mEd6O}u9M zf2j_?qzM(@@9)nsynp4>NuIr7rmCz-MvIfCr91Avb)H}DpPfYCt?gUCGc0@U|MiNJ zrqRD=@tp@=M`ehwu-kic+A-$`CHLRHE>}CeGyU6Y33h=pHuh%b0FSyrsgl}=_19iI z@NLXa66e@jyj#*bo_+n~r;ARnW0qYU6XKd+zux#8U*Gk9l}!i!S*BM%k5^18I)Cl% zb4RCMW#>NMmO1U0WiIt9)QRai6>M(JetdpoZ{lCs=N8BK1dLN74~ueGO5I%O&QNhy z@9)O{EEm>QEzUapKYztP9_F$e&HGl^hg1f9bU1rm`S5}yzY7c8HapJ0kiV)W`uE@0 z8eEzzfuV8}qaXOR-hKOhAIEd`cl_Ne**Eo;Op}aQo4P>#g~wg4Ic~eB7R_c9+-S>R z9?jL4dpB(NR<^(U@)q6}Pi!o+c)(EAXtgrWq4n0n>CMdx+)_S^`bIO`eyN;Wv^wsc z1T)`_=D1ZtA&gUI#}xbZUJ6(pntkid0E!ehN z@z~mcvZAFu6LMC>sU`XDmT!EyXH9gH)anyI*`MlMy8NYJ!~R!4Ru%KL*xq_`dSCW| zoo%!CeiyoMxHPzS?(EpD_0onBHJWzqf82|Oif%dhM1*|!lsDn;wch!cZ#DclcBNG3 z)3nB$4J%x=;!>Ob>p#qOa(DRJp|)6w*afurPn=HSX6nw z@U9%o^G3P+-RaGBuHn~AeM5`4!s`H8?y))zlfF7%C|I> znX&WXI=hAY$1 zYHrqwTYRZiVSnr@Y(n-2Jb$`vZR7bb#k&*(9PD-;4G?^$H~o#Swsg$HPd&+&>ib%R zv&5#eub`O zVEHs}UfSuDuFXu`GSb#bBkr=O@E@o43;>YIOMTjZsUWSi%VGlYcJS)#q4V9?)Oz#|qtufHaAMKRW`RV1#Ew3%3!;P<^Q&DF=7>SBFEHaDDFG_PZW(@*mqK1v_aLhGCJiwAt?a-*BxKht_2 z#>c)lzH((&1LJR{d9#d4=l<^Ce59)pG5@pQyF!f_lZ`dfSv&Z8l3GMxy|-^VoA8%4 zX{yI`TgAU;uZVT_JKSlKjTUEb-dOqY!5^6gd~1&!4%4uhAG4|9Y0cTw0goSd)V+;s zH+rn)x9%xR*7~YrJEkwne|T53Z^r{B9+AsOQ!M6f{rFHfT=C<^$7lUzm@YbpP2g*o z_(w^$Xa7~DS&J7P+&lGt@V@yDZ}slVy}Tp+=Fi)=Z}}VVt*yVx{crwbi4Di)uJ}D& zq1AA|;eh#S7KamGzt!HVW3$oPClK6VBD6E9^_R9YZy@iMcB#d7Ej!r5V`Fx62IWYGUFX|Rt;p51@Q4(=KFya3)=ceM^3m1Py|IISI(pgy$`$s9Jwc*Va>DPHS ze1>-y$@SK8bCo^!Iq%CRCo;e5``Ungsb@B9sdD#i&00HapM0eJpY)dNJa3t+CR!~v z`f=J&eXnQz%KfanEx&PoD_-cg^4B#rZoDr6wm&?RF2`?ynDZ|?Tb{%KCM#8GWo++jos(czNp-d+0MK?FR%K}uRD`$ zEo|Sn-FCU~{^hYiMw;&Ga2^l))xP~KH+EVsqZV99o9@tT%=_td+mOLaYTLlPFB@f-I1GkRalO# z@7dUFe6ZdA<|XDMmVvS7j#TmAQo5Y8^sj4s`rOHiIS!j8YZo81JaqPWwegGe65+XC zA5Y3vb$)#0tC2DPcgDRMiyvWEnqJ(Ua8>DR`|DZ<7tZ>Jxvjr8o{$q;by-XHk36@v z$f^amxPANG``BasYS--F6{`Qs^6hHvrq6o)1^w?87Wu88c=vYm3j6=XN@Zq{ZGc;*}Ly`y~yl?yPREYFNX0jEv`;n z+VuWG!I!=nM|~BFANI~z(y36!Rc$#ZdY!rJQQez|4Ytaj+OqD4=ZDJywoA|L&Xs3b z_ENkgxy%1sLZzbh=}SQer}n8&pPR*VTq z|Fl@$`L*jd@18JWZcXyjUU$W|72Ky~75~qkleg2pSwdr3r~m({)?eozNZasEq;(?G z1jbLMFL|y{i~VP5$JQ5r_xFcWDi`h>`+aAz`6wv5Cg5M?<~NCLUrbdTPMn{}XS=QO zx$-{6e^OhP-&$oAT(gP2UeJr<#ab_I`Hs&~mRY{>9#h4Q^+FjQs+*s5jqv{_u=>=h zfDdnjp9U-~S2(iv@Q!V-9r`Z|ny{^Rerl&wo&J@?fo7>JEDBK&EztO4I z;!&6O1@}GL_nMOJb1n9yvZ!pcdsp^IeS&RjL&=g8vEBb(-{84+_faRmXoG%*@AkIG z$G@4y@01Nn(tF=4uJGsS>Pw8TPs+)B&AQ66r)Qti0yUQHnP1|{^#z!p`2CbpyLtFu z(hBkJH;V3l6CXb~w%~|v_%^3EYhHM*KGkfMKPN4Q^NPq?7jEq-^V>2nR85$nXxIE; z~t!uaj4c_?Fn!eVp8K zRN(uiQ{v(FY*mYXxw$e=b%}iy@qOAK@r{yeb|1a-RCssGVi``!%lSHfRT6ypw*>d^ zV3#;8dhJ|4+p9}qJX@T8irsV;F_vUCJ?6e8-(2KWP0+{o2U-ihiEMszP)AzeKDUe6 z9En{&uje)vR6d-zz5goX&G4|vaw4^-4=Gi11an`NDp(!xOL_j=3!hG^v-7^>+j?qC z<%&>~4LL^|NKS!7q5oB;*Pqrnh*9|c^&Sbeu25PPfX;mO6$?qmGjr=**^SqMfq=^ z*i?_%H7zx|2E5&s1~HqFrEbBHVGt3AdpaJx48T@&ks_p^$% z7OQ`lG($6KZNLWCZwY0htG4V3`|rUj>do4lU%~Rl^Y64>P9IOoozdU$LdV;i_qqGA zKP4};EiTtw-)SrAFl|!ylbAKvFKH-DkGW8KMQE$skI4Qj`bnQEOEx)GDj#9`$o=H+ ztgV*T5`1qus>**lo%rbgTh&(Rh{;4PA%>hyt@WTvH#qO4T-}6Rg@;Rjbg`#9{At~B zEBafLg__n0{xiR$9y`XaS^hfx;JYn{1)g6P_*Ss_{BO6$;^6J4?zKDGFP45S(&hi{ zLYR&Ayf&x*f2RJlEckHjQlj>~hMp_g@0XM?ZHzUWF4*7}xwLN0+U!djA{_3P;dP83 zHmq$8gbi+C-t-52^$cjU!xJIt11pRZig1e-l=~#drMei8v!JqxpO7 ztWF9ak$b2Vf8^Ju_A1f)9Pe1K7Qgn%wPu>JF8xZ4yl>+h_GFO5CC%Epqvb;|n+V?@M~HGA^0y#Wdky=_G@#22b8kdu0Cl(jBIstMBJ;4LI_?ZvWf=OIFLM zOjbw@d-UVSy@EH-_Z|~Hys$3pcVn|TQ*?v|Q-euRiIZU5=gPjQvtGbuwCCX#ZNaSK`R^r2SvmF9!Wn zxy{@;M^$Xc!B9P>%$Tdw8>C|%D-}4$Kb@4hJM-?Qx!EyHn|2%w^=bQHG{KFl(}8W} ztxa{3C1TfiGAZ@2?%`EWd*dJRS2^UTRZ7O?l>t_ZYEHkJ>#$f{G}Hg6QuT)G*&)Fn zcD<06DG+iJb6fWPhiF-NtmFq@p%=$~&6vfuYRe52Ugx9Q&AR3x#b>e0-5 z&czN=yvKR78=R|l#zo%YzdAp`&rI>vNogawb!^A^ZFckUs5ABmTd@0=Pzn*F5eS-_@n6K1raZUSQ6|gPu=*5E*7hHR}PfPH|vgxmX zI`Ev9WPXz{a~@yS>~m?_8@hXa*tc!=sb_q1MSCXaoRrOR%vILzGx>6oH7_^HR?WP} zmXj=L?C^Y3NIhT8vh9}yBwT81Ip5TkXgp8h=SgT;$KA6?w=!%+M@`X5w!eb@F9kS0 zt=+!&aps3D+J9HnO9xEuna#!2AT!rl?8Rc4B;kT7u{x}M8>02u`8H41PzXFOz&+>j zhI@R!ICe)c9ocw&&wsu}4U4O$-(x(oaq`k<|Kqu=dSk0N3qszfSa)1iind`8|Kw-0 zH{D>)tZlOuxy-dnw4}B9 z-svnC{g$2^Pp)2H)nJpAp>7^jW7jxMk^Qtl19RUFk@BUYvWud&E?A)ETXJ&l_6;pY z|DswY;@h}b`uZ~XWW#M{8QAg8xwUiNr!S0ZFWfl~Tq!gzSiM^P?74N1o(0XQpI(2l zbxQr^ttRWaFV{t7o4m-b+Ev7MH?n%w(iw-g?1k$5e&r&YPQ*ANZFB z&bNOrbnl+&zgqEMVeI|0U)NtX{rC3U{WtpGJkmefEV;VdO!Xkc#lQQi|9uU65O}?Q z!*>1>&A(C0r#BzixaqX&^X(4xYi_^JJNmui?h&QvA2&X1d+2HL`P97R-y&;neZ6== zvu}dEin{7@?vC`MNgrR^>%UvK@vxlxh23AZ{_<|E1@;%uzc48Hb!zDaWjU=J-ZhdN z`Ok^U?A`b`I>7BQL$dvXMJqg0HeN}d7*LeX$t$seeeROwTGcB;c3pdTj9cMB$=4^p zHai@D5%`M3%(-;`!iy4(=WYeNIzEVg7`XPC+(1BoIH7VU0aid zBKzrkBKIREm}q{VslBI_dCs4T(^GT%9huta+ePsnVcyjCWl=>cH&==C+_h@XSJy6N zp5@=T>}%DV3NztT7NI%9Iu5xPn|q}VwjS~N@H^lW&o$kp<+8PGG23>^>y^qeSEF5sm_=ERlou1`ZW(j{)I=>Fctgmo0#dZek`uD**SO7{rI1DE506U@6B)I z5PR!7J87l!WbL38eqs5|?la2Q7o8I@TJ3p0Zhq5k!}b2P`x`#ko%Of-pk;By@@(N> zxi98bYu-iiJdbvnV$+=Jx%%tkI{)wOuiC8cZ?EM(wPnqX9oIxI{JyeTtL;&6#qAx& zXX2~&hT5((b80Y;zss={=uO$S=fK)2AFdsX zZ|M}cu=#3TDQ8monltgmj6wdf5p^$hIyM!pj_K0u3oY#7Tsq-|WP;&zSML?6*FQK- z-}}ILQ_f+n_{PGef#PzF4cVq8e|ZDGPMvV(nb4Ny_m)`||GtsZx#-E9O_dvBs#nil zWnHmN^X)5n?t^)~Q6=#lNjofbmorYcSlX=|)!18|EdTlof5MKe@+%AVTlh1@?tgba zaQViacia{~Qm*tpJ>Ogyb5NP}a>KJnoQ5ZUEmzIzn4BaYv(f(I%Mcxz;#&ntmopa3 ztnlGEQuT4~KfcfH5whXQJ>mz;i&!I*by)U>{4ZGk+JW~~*S7;+f1B%sdCuS1|4@Q6 z(RudY3+2{3_P_gDF|%}m^oyLYoY%THWT|?cTN(FIr%*xZNxBhF({r<^+q&X=^nT6b zJi+*O(e+hgBJnmF(%;)sbv|wSymsHFgC2e=zk% ztU|Td|9a)VDH(cg9gY*??Vm4~VQlTJ^nY@m@z!Ui^FcYASogZ>Uz&XIo%CacPfy5QF*nT^+n&USlwsW);x?fbzJKBvj4O`*B{BOt(hU~vyC6HKXT#q(cSu^ z{=e0`slV?hMDEjIzuJ9l@dN9d`~3s_SNw}SqWtz4^X$kI>JIZP-*oj(@?^XIRdj)2 z?9s~sn=_jaozp$=cR~19E;b8+?LQiqiYumv{^FNBs9-0Oenjwq*SRBEi?ssg1tbP! zxO~vym?Jy$R)OVIC+#A0nZf%Q&jrM{Y%WwO-G`}etd9-HX$IJ0?+j`;Z9{m$l{e~J6c@dWYg{P#1s z6Bp06yS-dyN6FWU^Xbwr+Dl7ICnOcW+ZyOH<9JAk_1i_y8edDC589_0P+jtQx?F|K zx*p5IuU}j&DidEHdF$S=RVjvr>5x}j^5%bD_3UM$vUP&^`xz2~2?dfQ3?mI2Cc(+s3QSF_c zD;0vCTKr^k)vq>SSGqELYT$IH{TmL%OI0A^Oq3Z<=ik$jh86et3>!erWU6s?R_F)$6KszmA&q&uwbcsmgvY13*k!KG|AG~((@$OP*(mUQ!>h%nj0<>QX?~S57oH+!8E(1w ze3ONiyx?7hEejUM?&kQQ8UL~3K>31mD-5nqT2y{*o5Z`KR|~3GY?l4LqGK=YzVC}f<;lkI|2mWa~`o0IQ~TLaKY#Qe$Pi-1ZlhvE-ioie1Y5iT}yB6=Q+M?o&Byl*^tkfYn1mlZF-xvE9^Yu z-^qpZ_Z>JZcFF$OqH?X(b^*o*lLI9A_uH)a>$N@H+MaQC(7rFft_g?C`Dpz(OF(f^ zb4E1F(>OEB*WJrL#s1V`+3iwyzgDjz{>$uWP5BZ_Q-6L270Z-6M+-V{{XD)_ z{cJU-e$5JwiU-O}dDqVTJ)AoE{p=IsbB{25IP<-7k(0Yd#|gVh|GAFvL|9e+jL6u( zq3d@?UBZi;|Ep{dNZCf#$F)3Pcy?mo?ALFt#8w?QiNCc(dCslFIg6Mv+5eJOGAzCt-vpyq35*6OrOJ0J*UuYE%#@k^v`9>Z(q~(?v!O)u>Z%5PK8G<_7??DD7A)so_Y6Q z$L+@*+6n!Keb@i{{XBEW-@KWN1WXp}t&q9$`wUWEDCaNX!xe`w7o=U8$NYO!!qrp#R=%E%e=b@sEuP107;{G4 z{{G?Ab(id4ZA>sf^G~#$BV+4}#y#Pe7tX4EdoNe4>0eB!sohy$%M_Z%h+hA&-!4|+z`ei?A+k? zC{d2#)x~x>g{Thoqs|W8ZJ$^!^el8@&^kC^u2igRaL;opn#IYjSv1U{J#9@vV*->^ z;ao+{i;28tqujX21woHG&?Di;zX*VUkxlhhf`0^~_-P_mo z|8{Hcopw|5`-d5!|FVk{58sYA`TdL4piKM6Mg=w(=8N%PG~b=lays|I_6_s7(}Irz zGYtQ9Mm0-2&TX`<+5N0}-?Cd;*)D+_SU$a0)b^! zvW|UY^fvK{f3`l{WMl6C(qk^qx%s=def`5}HK%sVA8X%*cXn!ZA7*Quw|bVe{lXVt zgPs)_KT_Oz^@Gx!JH-zU%-Xjh^_kLc|JTkB&$AkT)^EtrtLl2brb7Pxgx~91LxWB# z&(3+kZX2|p#WX%=@1CPI8rv7A9bb@sz+%;hb|-ZOpW`pycW;RC&iUy5iPe(j(jVdV zF*kV)`2xMC={Fpb`|0=dt)tnL{uBR>#(IV=n3dt9d|_*EZtqsbZLhm_T(w^K$^7g0 zYj>IBYEQ-MOlOE%$$m9hWbT8@e-2)>p1N3zf8S)L?IF2r2aRv*=lvCYv(or_{X+E( zeXC`d?tJ)pdB)dg4c%w1&VQj8@ONv+m2b5R)|4;pNXWkszv68cd%}Z~iBekLb!T~% z{Ox!mr7vxZ^KIX;C%0dhr@g85=dnGT6lR~=w`u3s{Ks>P>Q6~|2|W{cNM9xQ%J4(p z%lbWs*f{=gJ$jm$|`DQ zH|1I0E?g?BFRwp7zkPA~^{4p}Jaeu@-(cJEIC{~hi+8j^(^ED|%R2fW{CMiScDqd5 zk>`Eit!JjZ+hxh%_Nn^|>lUANAz{W>az32+`uj?`-j%W!({5RE^6Y+dZ_{g5D>wa% zr}KXA-~5Z?wu6qz74r%wkFY1jw(<<;m)FexHJ$D4!tE>iME2&d5maV{3^%V+Rf+55 zZ%kIKW_PP+v2oX)%UcmV?bNk>ndSXw6YgqHJ9yny>)s5;r~Rz!*S%zQyc@mu)*q`6 z%lIySHE2D&(d|uH@jmIL$#M1kwaSIL#SfDIZs9vzm3dR@k|Ph};*A$f|I1q3 zsjq&2RNncR^L2UeU2IA73#P9xxUY78gXEfOm-@BrFBd+T@Yd+`QdXCWuQ_+lvd7%2 zOsllx`lb1HN$rL>uP=JfdQPoBqGR(#_=x$9(u{s~j{Kcb=MGj$PJLglqkCS>C_b*O z*!#Pz?F5$e^>6HX#hQ(lNYy~^^%<8DxTQt$I)Q$B28`NwZtOH04s za=9IR=`xSyZa?CCG-rikI@9;reDBL|@Lao_B)NIls;HHA0v6gvD-Q~-NQu9`-A^)L zb?B@j1|AEMjsDYCvVPpTLru@g@9UQrU-$$bOHJLmN9M`#H0zXphL2ljDA#Gc^U|tw z(f`;d!OeQMxcXTwH+y`%m35VIN~v#b;a^Vy@0R@^7QHxpBqHh_cgP;E_6D}C*{!8* z2TmMYE?vue>R`mtAI2e3vDuE3g#|to1%xy|U6B0s^r@&oVUv#SM`b2*RQ9J!Uq0>p z=IPqSVlnM|t{1zfOk?~wXNFSQzwGVL=WUc+V|{dvubX*jbSck{om1)#rrTY4c}02k zYt0Rtiz_ZKr9wqZWlr&HwQ$L_sEd|HhlogdLneE_l)YmFZ*bbD`;u7ANALiYG{9Uq6zkxZ~WX z6W=769`??*z5Kj%L-F?auT6Mfw|)`xc+;S&6u7PFa=vU;O0xEjJFk3RD25B@wrJ)r z-^p6GKiN2<+>0&TlhMh=`j$h%?K0h4K1};(T`gnd+wt^j{F75zr*$IwEVung?zCR_ zrs2l>MSsJmGM1jRxVl5e#rLAu7L9jayZAqfC$==ituLCQedOd+=4)G;Le_WdO@Gz! zVXE{~r>=F}xi2?;pKiL;JZ4^D$^*l63)8gSr_VJCnCz|V_LF?@dsV$lfarzxE8VX& zT;)|AXMYWS?&|wfbVAQ zV!+46KcqgnmaTu2VR0eJ^WCQN2Y%Wvzqr(dB|O_?CLLSeW?9y6a>v^XN za#^|mU!ip%aQ)rzX}&G5->X^9`^^4Ojs3LCJ8AiY)<@N3{z`v|vyInhI?TIUt4t_s z{{`KRpQS!%=m@{KEnK4dII#3A7i%g4%U zS&v&K``%65T<~e)U*BsvEN;TO``G7L`m(6L+qrS;hJRe2nOBR0=5?9s*4@mpQ$5ygzHmeCJLR4G4;{Q1Xz!lix@OwS&Fk$Ml)Qd$=X>2@ z4)2+vrn{^&WFmuQ>ZN_Y>zNJj1!h%-p0J+&cD}7#h1VaYcgKVeDlLyt&pz#NqDD70 zAj`Gmrch~Cr2mJv;dTDLj91OBmF31VzF7SCs+do#S@xEkU0v!&+5;?X_s8W~9kJWJ z_R^v530sYlbG*0(ijPWOY!Lc==LXL;c|%|S{>!DM!UeNl|C@1}wIk!w=ia>91DP{! z^KK7!^uN$sn*I5oYiH_)9i2K8It$9~?mNOuA6&4oxLg|kZJw1v?Gr1@`PT1~c0XuUf6${ouVBm1UrVJ|AMTac*Y$tJ zy;Xbrn_K_A3+_A;dKf7D#o})K@0tI%Ys{C~tP~p}oPYXK!Nb#!=j~p0;OFDxHD%Wr z1O4`BsG7GfR-L-&wa~116QdocO!FcOyrmSo*FE{}{V(mW-?zu+ukU<(zyCg;`E742 zm-81d2J9`|Ealtt;J(G5&lhq&my}8se9+s?Q-56d;o{j7Ce%JX_DP!m@WFL~+>7rw zG?^D2Dqi1QbMAuozWA1>|N50~bxnLEsWE4Mz0rR*8J{?-?4zdz0tDi0-vk!ieRg?G zi0p;4SNTLw%a;Z|t7$nD|8C-Hg{L#QS;d_d_0m$$n{qEKy8hsjZ}WlwRa-;9u4}lr z^39d90|&I)L_QwP5Qy)t-DLBm=cK?&<_7`Cwq+kt*+n-pQwC9MKy4qgk{IJC2-yJUDlKwx%&8hz`z1Fae z^JjUeC4Mr$ah1y@fgQ&z&lMNXn*Lg40>hGtCqxzIrmSPk{MEIu==L|0brVwJ{Fy*& zl5%ff_I#wJ#ym5}t}pX$$)1vRv#ymIg*z@UbXC8*EnZA>3B$~17J)NkltoK?ZKK^A zpZ_qL{P$kdt>)cJOU^MJ*4urpZ0CaS+WKFWL@FOKcW0kuFm&x{PF`(ZcJ~oqr*?n2 zMI~1XzvfbDfq*0HRR6Dzh}xvPbc*JLIhDJf&kQb5$&NkdR-JKU%m00LzZ=i(2=1~! zmd7vl)+IaOG?%_K_rrjrPuoPL56qbSyX_WlV)5*`FMpd#l-(*X)?nBh+-q>IMah3= zV!yJU1IyY9iE~Siw&t&7y1rcft<8NVnKrAh1-&8y02s0_b||wr)0~#GwKJj z?p@!{@cK(gTGPEF(`(pWgx5T0to~A6!{A~ZSkF_nbKa4V1k24|e;+9ND<|L7m$v91 zOT;pD1I~zJEPqWm#GHSieBpFOe}6;juQ~q&I39&+HO*Tce<`^kwdRmZ!pgev{rpvu z`#&(g$bQB8Ri`3Xd;9J;EFUam3{?*Ze@XbdoPYK0HCw*W`V5mr z|FSezzxvg%jgOT%WG@v&zTXwFE1va# z)>+5ntCwa;B|MlFI>|a>)1x_;->>A+keA(In50=E`TNJt&h?DzN(4+B{^nfR&%l23 zjLd^2_l`?lXuq-OIn(c#zFY+pdDpN#`syajDx=W2-SPN_$p1WV(v@Ex(33rDw7@v< zmwST#>z|xo3fE?`URkhb9>2T%jj0>Y$UT~yB%YVW5 zo{f)rPJP)c#<{Qd{rS1VghS@SjrA8DFSLh9ik^8J>+F5~_4e2!_GNc}IA4E%e*670 zqxwzX(!-bRtlbd!H|_4Gk|Uzx7nC)Z{&mzhj|+5D=vA5Yf6x9kqDr_cW; zH;XH2@52T~t_+9zUrq;)-r?P8w_($n_RVVlSzhkd`{q5DH}=Wnz{zTj(V6Qn*Yz!U z{aWX%;Wc00^*e7~5<0nP-W>KlighC523u7=@3hUE<>`^-*`IdOD)nYwocOf2^;=E; zJbf=@E%5GB;Y=3K<9abR|5(@jder_o|Cz(JnO_cuPj8CQFM4|TPO13EchM1I*Qdl> zjko7*oT|)jdW%m~|Juj(wE{g`xuQj;F|B*~{!4$@F2`#}uhji&jabJpfhXd;`iA~B zIimRFUS&Hg}FP;(n&{7h$!=@%mB3N`<9)_Qb=d6Dv*uG?j4#~oI@ zyYa>2aaF)d|GNjQ7#-NOe@dRa@pjjS=b0WArtdCX+;$`@)H2WhkB=7I zVBP6!9Cz|e3v;A5pWgYlJ?l3;OaJZk?7ZgZp!qG#>5Jw}-_Mx3ip_*4le1Cw(5dY* zoK^wz1C<+pt1c@jES#HCD|bX>W1NMwz>@2_UPW#)IzSkJfeZB|2s&M9txpNZo7BIUYwk4L0%XQ#|q!!*-4 zc-iuAP0ilZq!yocI(W%u`=5OZR^8W+bRVtVWahG@BH{~s^6aLSt+Nx#Kgsl0#vf=5 z4iukuzU9ECMB`{XCedA?fA^f@y%2pxVJqK;-?Mqn{O``Vu+YkLFJ~xkB6su+$D`Y` ztK9E7`@dPo8+N#t|J}Ra3>7h-s}Gm6z3|G~^{X?w`K8&vInhkc{5B76w7<4BU)!|g z)bc%#?z7)K_du(7!`3zL#LpDTZVWFI@l}}nBz}^2W8(Z7FQzar+~|Ay>pzYsCA$}v zU3Aci{@V1&?&WWhgJ%!4^evsUdslqhF3sFDo`Rjfo$qe#EUaF3W%JTS4US36W^jp2 z3Ku#QBqIGxZ@~(cns+!yv~uN-gW{AJ}nJ7@P? zO?!7M;q6U}^LY)$nV}g}oaXWquV_UOAOG z;d|DxuXh|iczm20wNC2Ax?9m}7rZ#!b7P13neUFWrk0x1=e>{LTqVN7yKeug$8igc z4w|qTd0r0h{+;qZS?6ZuHxBWiOesEl{^b@)TYUJ^#$R`<;(Pn#Q+4oN{CqD>z zn!El@4>M?3moa+!hwl+7+<#L_U$Sz}=D#g_mqERD+q+wGe2SlyZh!y5CAF-~=I4>- z1oOLkw?5Wh$X+9I;_R{5h32nYe+h4xonL>V(6D9YGSOcwoD#aLp8Cs1kB6F}0Yt=l#K{(-n7qJ^I|=rsRA3?$@i#=INi%_{rlt+Yi3}U+UKRG)eKv*OOT@Or^iY$A0=0lwa`g$kEkbl2$C0lG;_n z8EWG+FZUWFQyXjT^$*z>3d4A&WXB-de7R*w)Sh1 zsME#t%|F*Co;(-qx=+(q@#(?S3zs)PsF+`y9(Il`?PK3NPEu&9-aN^pAV`Xx-YRBa?1~oX&r8ykOVOzIVHiJ0I#V{OA7KF(UEu z#=Xy*t7iutK7EyK_j1{9Ry!SjTuSq+{oPo+>b2DRzGo>ck|KK(t{#g|?7H-E*1J`2 z5ANKb-IiX!B3ao$}1`|JkU?bDVSXih88+`j()zuiwQrsb$ld;0$W{c}_PID&c?!56+| zwNx>mQ18|`5Y=SYy|8PdZL0K%oSLr}vjqh{yM!!$T72NWOKW_#EyvYoSL$|s4NK_P zTYRnYpQrsX=76-=rE?~n45-aJ@}g|6!n@VE=XG*eGB$e295RW0m(lupTjC*^AAJ*d zO}!Sd*6(dzuE-SGC`+q194~aUHtgb)=t#{GoR%%fw)>&#ABQW`FQ>3{oJ^X#f%((P zpJ$7IAJrR%QNY-x<&WrvHM^$IyKz@q=XCeZP&2`Y6MhzUWxvY0@%?qv%x+`Fny~9< z{5lon7RV<$%y{9VzJQUxbDx8RYzFtDeH9bz9F*lm_?dbuI_eyhKXUNT*#4dM;)M2> z{3e3@pA{~2r5_P?NS1q=D8PG^`3tkurwK3Et0aZLs1!uKx^_WVbdP#SM)*GM4_eX@ zoKGfsKHF;>{a=6Hl%+Z!R@VjY=X0NPjVHpM|I)fRyD4`#Z_TaTacaY=2Rja`9(k?TJPEwp!YY z%TD7tvoCA?D{i^?so&Oo;A)wZw`Wzl=7gJV=XvKh`-OcCiPZSix4<~>5ciEUPPU?Y zH|L(ZdtK&|TKw+1oq`=cH-pwNUYzKd#B`z4aSwBe0P~S(hvX^)85ef8j_r+oj{@&8 zT76nk!S14N*zwV!nysVIL0vA@=7J-S*!zYTCl1Wszn^uBICF*cixUopd@j|W-^U(F zFl2mjbh8ipMNb})#|_(T4n;e#vvq7d!0=J3xWTKcuTF?>{=J*#r{q6z75As_W!=>H z$LZSs@2_^HKYu=3rFfR{f!#8R@)EPGO*U?4zSwJiB)eh#NohIzRe_=(6dCFl^sMkK zT_EGA#G&Eto5hg2vNLt>u1ZOkMRN>t*L%nwVyr*psu9pA(6n=ETNemc!+vF!VP zUkF@rcSrSVy4!7GdR zhGdv7e1BviCnhK?{wXTe`=%x%LUYCE#O~?xF-bvLufI3i6qN+ly*Ojb z7U*WD&aJrh%hd4mUt2?k>u&sers#2d=B4LFngZ=D{T18=N1HD_TY5hC^|>97c@N3z z2eK6i-%Cn_6U&quhHCv$^u+Hi1_vUqu+w=0T z)ozvEVfS+D_0>Wz*uR9%t^M57-N&|Q{|n|G65XJfRdr!H*SUS0cYj`(dEsgA z@yqIU?E94eX0uFX+8fJjnD?;%6Kl87Kktp+znspkSaa6A?a-@N_OZ3q@+#A;Z)=uW zonU_&cG&yQt3#kFQNJ&0k(Jc`woS*izH-X)%HHPv^>40DLFSvVi@yb4I9j>PUGU<# zQ1(TK62`x+d`5Qsx82;|&i*DOvvPa(?@K%rwmxx@Jg_$M#O?bR?jKkFnJY3W`t`J} z_U~`~tqgzvegFT$-}1Yg>bKnuiqA`9j&zyq@jvEOnx&)vsUS8N;g2gSmT=^~m@Agw zm!A6mvB*Oae!+Qrm3D`+ZBJXeYPuBTE8oYWo3HPQoyhe&&oz35(%lDto;V8@_7(j4 z(Z^rD)H&nwiBq*&4lnah)rajhdLjI3k`<$b$FJbIQ-89(PTbY##qwPJ?y2hYO&|81 zjeAqgx{lYs;@_20jhK)R3HOW@s=AgRP5&Qf`~Uid(_gp$3f)kD^C9zdDS>^Q5 z_2APf)xAOf4RR}1Nz@;#lAIBJVtz`sM~8jr`v&K1#%vP|rI<>`}R z<+*q5r^K*!-aHxgKJ1(p!>XDK51M!BJ5HU(D|Y?AM93Vi<%f36T(+8HW5ri_q1_7G zJ&$$Ilq`5~XOj9ftpd{>Uq2SNMfIE2EY3C;=sucyQOH9zaQ@E4uQwf*`{HRE7Teg> z=ooKus=-Tc>o>E1awSdwTr_^iwN)xZ@mKGvEup8(Ia40H#9tKj`?n+aDWA1R&GU?% zldmeSaoa3fTXbM=_{xn>t(y5RhF_7svv-48RQ>XJW>7tDvD4v)@Y%W-yJcfe?cDyg zQtFGcmB;_cHHFgkeNT5vu6q5_`@yGaw=>?y3E1s?d2*j!Liv%0iO-u4B-zIHZ*clK zP4B;}pw9kgV^jY69ZQW>_Ei5m)VNt;R@eI!ZZ99UXO9*=k<>Y@b3g6x)PHsk7r4o=ozsD!e~M z$iZ%B3S;*d6I+>8{_B1R{N5O#wmYccgXD$XS0-nvyXxQAx?|ZJ)1Avw_Epvv1z8-i z-Ld!mqmuzM;xcq9_*|SXI@$!@nOgEcxQJ)k5kBS@DObI|HU{lv{Pr(hVNdb%E?KFj z3Xe7q`v;5cmONe)uunhKHTA;8s=4=g+n=xhmk_IaV#mBGldbr&j&JR#Kfo??zu5Bm zMy@X`wgKTL|KHnZGR8hz)5j{Pa&PKWg&Ru)FTX23_Bp z?v0hAs}w6jzh_H)U~1{fE?M&1LcqT(`BU%%CH1eiN78>q@A)V^)nUJ9{9D%JayNfp z?fN`nlWJjUjnD~(pR-C99a(<=*LDp+kSmd+hDfR}Ax{PuWI) zlf2NEwM6Q)Zl!Zz;>iPdoV+G-omBTT@BS~^_hh~8rhAN9yemRC7dn5i5BR&dDsaK} zRmZQeRA*<()R+E7 zc9Ri%N76F6qq>rfz1ENZnMX|HIm3O$b1K_Y^Hw*O{oTluP= zje48&!s>r({(LSlD16DRJ+Ia0`;-+^%pLwOiZ}emEW6^-RgVL~GrnlK_8RSF;JNPm zwRA<;!f(a7eNH!Br@FU!21I{N*g9{K@f20r?wrKka!Gf1QiZj6dH>3+dcWfG>b2qq zp8OZD8l3(1ENbDOv@asc2Q9WHo!}9*#3{``j#vKrcYViu z-f8nzRloZ8z~W%(q-@p|w|6|Bk+=6?X@g?<0^p4;X+PBZ>-vz9~rn4JGTTLHZ-mJ>InYj+fU?BqElWuzWXm9@Px1Q9=nVS@2=2T}L|F^He?C*&!xvL#hy0;YxZ&P6W ze&TQThBKS9qE;XO+AZ)S^|4{^E2pEM1mmyI%J0I;Qz%oNNPp$3&V}4H4JL9_8+Wc+TdEhHa&7-&FMFf!j=4& z9O~qYj=MjNbNY9=$f6vBj(tWK9`HSx=&N>O*`sJ@?j4^_{Cw?x?%+x@_Umh>AIN?b zT_`l!v2@d+%Dl9R|3r8;zu9hC$DDZ6*ZZqsQ?&j0&-;oU%CE>}asIddI7??!>%Coj zZt<*JZF_3UKbAwUO=`EC4^CMAHrl$B@!HGyFD%+q@(mj9t2dd$Mq8{iUh&BO!{)htjrm_!U0wBtX|Mav6F+o7{h{7zox$sB_%?bkl3u@xUF+(P)rI^W3Ku6m+x|CRRM08-!rq?U zJ=Y(2JXojd-S2SgVD>uByN*k`)QTis-*3qgbdU>Pe3ezhc5zd7FTY}j%ip_m^%$7BWxR)cK9((|DTyy-?X1Yc;SNZRoPw+G4D>D%RZ!N`XQ;;`>w;3Y0^)a z@_rgcZLrzEx@q+tZu6u`*W)C3-LJo|O1{Z^p}Qp7RQSX4Su3(zKl>SKzBp<$QOC+b zcRJh2*nX##2UAyvRZ4#`HTAXpcz>#G#I6R(SJhA1mp+@aGI%N9m04F_Twa&$pwh`< z$?oxNkzHczCv5=@C5QZL{i{q1N-n-zK3%Tub?@ZO=j~Y!Df~Vue21$)<*|I>eVap7 zpp~cm-*jc8Ei9amER}1G&2FsTwEi0}n{3*gbQ`aW?Md5Ci0$%-=Tuo|`|DL9>+#=t z8hd|QU5IGuc5gWSK-TV5huY$VNDQP*@EtUxn;u8z^&QMKqRY<9y7O20K^N8>Lf42^G1ymLOOuVYr z_|W!uBA-07_Sf%KK7#SxOm{t=uROo-)us=Uy7f&zUKPsc`n7dO``c|R*YC)F)br5h zh5VPxzakadOMGs6do64BZ@IVndBfkB<;P>bJEh%zEj-!E>5TjAv~xQdf7#l`R5NeP zxl-IHYc)&qK$_U=^9{K=X+|$}t2pN~Mn|ksXTEK?HvgLUm-GeKKN&x6H2t&SI8*dj zqh-vdMJj$#tf6JO}lXV))(p!x?RBVTUdUQfnaN{Qh zwvNn4!3QqOtoUqayyd^m9v{Jl$zO!_^6=>2SbFd&qR`m+{kE!#MMlBGn>CBw)^rdu!jW%0d;?0L?p(9UzI z(P^%K-%qRJhMG?$+cG`P0vztMG=4kE#o$jtB<2 z`7E%Io$kw~)|?&l_}lMa&*fG0PX&rq#QhH9{KUQ4I#r)x?rQlf{`bHAu02$nykWw! z6a51Hpv6}#-o;+b%jEp46vH}UuZFJi zU*QhExfV|kKUYk=H_`C8vqPWBmkGR#%0IuWcx>emf4=J3G5>{kK5A_~Tq#vOyVr0}cRSW=cS&g5eyi7C-lzsxSnaR=_gi6B*TE!*!uT7y@8;_* zv^3joqAughyT9PYqtybt6OIP2mTyQqEB`z7L19AA3gttM-d29{JKKw73J z_~DO(y_2`CX*|N;-*0Uxmr@=Xb&HYld&UZ#8LTZvL3ODaJf8RG*cX^E_^s`h+IZUs+f$A(Vd$0KT-U6%WVC$8FSJ^u}! zTMMSoj<#@B{xM})g`bsU?HaBF%R_d0hHiIWyQQr&w%Ym5H(lH3{A~x4efRbKknx1x!q3~zKeUtU_iOnTyiT3#TjdohI-hs_ zPWgZ0uX6T=gqNGn3NLLDPI<0kHqWcg(Mle2z`?w??tP3<~2qw*TIsITkWYr@%QxAF9b zHQXyMdPzz%O$L zcKS@H!m*Crq`ji&4!eCUdcF6P7~h1iKfg|pc7K>KJvCBWX2FBScbI>sI+O^m@173w z#H`=v6CyX9;EkF&$$HM`+uwgReplG{@!aI<8pmHJb&ELb^AqaCPgxY+*l2lt_rZ_4 zv+M3ivG@qMAF1kzZGVs zcb9nUUezhs{ow1?`!yWp`E@(*Z=dkv)x=!&U57Q7=k~vy!x}T?eD}eyHSE$yo01?4M_Avi-=X=oI(oKOB4#LRw!;oABBB*3B&!74`}Jd}MWP z{=Tg>57WA04~Z9rrOWMk$6hF(|9aO3ArY15U(ZHzmxv!eqJC|K$L6@xmqq-Rp7LI} zsnTkSZD?h3g{j4jq?d1=-kT7p_Of}keuIU2`{_oJyKC0;J~}w($k9nRz8|}Enp-&B zdCv1yf!V(s>Vj)m)v;=ISzXb4H~DY%yXxlB;JOPjT$Q|&{`&u~I>z01CN4Q7*_ouxI6#pFw z-W~hk(z;;H-*!xazCDxoh3V8UtMlE?+WyP$YHYP*Zo63MFMEDT_eoE`nhAV=xk~+7 zTEn{qkH1Lf%-rK`CCVYV)nR>D<|(;H$JVUcV8*`AI%d|y4IC|#=cw;r@}k{o&5^(P z8+4`^JvWwF?Oe)i@#n)U&ey*VT>bd*?m0b{i!NfPT=L2ok6J~#hc%xu51Qx0+cLw{ z+jdd5)4^?fCj1H99+h{rA@f?QeD+U99=6>%?b{FTTbsP;^z;LXWgBjEExkSSQR>UH zSrekTpT@7S(yHMIc`fbRunez|DQAHLHQysVpN zpJ`iiCV031_V&l>=54w6c(#ZtAHCe5yl#ic_mlT5RgWh`CapSt%5IZv%9WkBjF)O1 zDT(}b;gey&i@Emd|G6%B_lV~g8OJ}o`22eOjUSvU+pX`a)+wLZ#+E+Q^W)xzwE0GN zy{BK6RxHSU`+9BjfW=StnR7Jgz{d$Umg z$eZ4-NINO6;!pQa+~+6}(CElb?*B8Q(eD? zyZ!mPsE?p&hxRSeg#pAA5E2@}mUjII$TQBK!S$h3@QI1cE&Ff>` zA4pV}eA!=MC${{dj;Z(b)}Z&(3)jryRt)T&|MDN_oXUdli+}HV@aG-#Wg8x;B)it+HZXV2c7?KuQ=p`wrt0lX;nOp3r&wSBUHbH*+ z+Znb(M}3^|JQq(8`)kji&?lGw2Z*(;YqdS+YUclvVK)vIJ@7~TXu!dT?J;l zF5!5XCjK%0_@hOe{cW>t80r!kL$miXn5tc$eR-jJL1Xe8mZB4vGLIJ2O*>FtyJi0^ zF1`EJDZgyk9=WcJ(1l<(+=FT@y&Z&cW{Zjz0R+0 zzXGd*+cV~>D;#`&qS`&W`GxjsPyW1p=BiVF`@gK)9wPR&gW+v##k~p+zrQ>FuAG~9 z;CD@vd`H?NLqTql$=Pjj%l2Q>Z~V*B{(jDE=O6dd=G8_wo#uYWTx-YjcfzWyo`pYR z6?9^cNdL-y$~*NuyZzlII!E*^x8z;Uw0N>%&;PE*fYj2zQ%koyuPkP~{P%c+-eR>? z`UbTED%)#pp1!|!Hull}yLx%MrbWbLFRA>0fBkGG3$@~|iVNJKd%W0fJyf{Y|HOnmne1z}J&M6q z*8a7hp?hLLaH#5I1CAW|d;3H4GlCcY@45c1F>&VK%;UWWjQ(z|+qpygt(lIe2;0fM zZQB(LKlJ=vD7<0US%232-wv&|54oG<8b2jBEx*2s{g>k0RlN$YF8P09k?Oejg+b|s zyZ-{ly{`NV*1d4|7x?nj!RPU%-)c=C_%2IvX#$R8SSqFrF z5w&e_+H{g}_hi1aGF%H^dH3$iHjs%?vemCBVf;Je+AYb|wH!y>ZaQ3Rdg8p?`EmLo z*Y(bGAFpEUcCCEKyJ&Gmpbh($bdkf2d_6*k8^0xqC_8RR7g28f_NemXnYDjisz2_L z;N0@O(rw1J+5g{L&SSjT7ig3HZ-4sP-@N8$pPdrfap`}>i<4^$Y;rDd(p}rg+Vd>; z0JHrX&FMd<|9CIC=FzcBN2S&r{-Rl+_kP;buc9SuKD_u){>_b|MvB?zd;t~T_3O~>VH~za--v6xkwgXweQ{UZN*CL z=dRh@kdv3tx^CNs$(x^=?AZ1p=f_U-gv_nwyY}2?y)<1l*3*thDY#DK7z5w4*QG~9 zuiMA&ddOw*uy1zdOFoO4wOP8i=jP{?i@)3cUft(+;J9(H~VqMzZ+Bk^?#J#vn1(|5!;mI&sJzXc>D0X&(co< zm&`uxeRoem>4=CVlS+Y`yw1DHdl$bpJZT{F#p^1^9jzx@Hum2>KJQ)W&)ec}*H4?aQD!qk_>vRbpM0KhO>t#lkb#Vp^xO@vm{z>!$`<>^ z;^e}9@fz3H$wy1`7|tDXu5kEJ{`S?@SsZn`Op{mdwo{p{(pab z+rO$zDem9>Qd->qAA0{Tzj*v>++L;>UgtG;LpknVd@?t#{orF;`T1On9j9MzzvAE( zx9>nram(3CpG1ie`RMJTzZ(ONZ46qSpu8eBYepga(d%1H`JKA2D!GI-1s{x_yv?42 zQ@8(({WrN2b(?mDrXAOb{U4UqZ^f0@UVG}d4NIxs*B959ir!GQ`cm+LVQ-xOW#jIJ zasL+I;JIf1blK|ex{$T4Mf{;J#qM#eQoYWXZ!9LU#`&seo~q#nv1_wZx9pj5xTJO} z!#VvOwlD8;99nMH`#zfQ&3Ox(mo;)51rhwJN(UKlIGduG`}D@|jqlS77c{=76uSPkiQm?zFT~@Y~kCj_U(Xa^-wH z+Ql*Z;IH-?wrE-jJfe)#XK{rl(aeVuy!)i%6UYu>Hi+qlTDGcKb~^Pa1X zo?6ol{X0)rHwdpgbh#wUbzb2uxi6l7x9wsQeSIzF!U<`ul~LMK`?;+gXUBB$EIZKn z-%3pW(z;D+rW7Q``&_;eU~xHn`n}5%DVjUo&K<4t+h_dsaFv0DSy^G}Ox{wnFERJN z78m?G_PFc#;RW$mM7Nwg{Agd-gUCyuy(&j9ebQK*e8o8+)i2}lv*rW;L%z=Z`mN#K z!nRepGd}5xeVrcKETLQ{kgk}Y`0cUe{sU88pWosC&y_N9+4>}@%NyDrc3ivv>iU6q zmF*Vl_8j$_ZoaYGeemery>%=1Ent5!%Zl&y)*t`aF1qoE`#U9m{WJF`Ux7i*%X6aY zikpkPVor%Gn4R{Jbh@bh^{lSOR)@J^F9RNSKX`r6cR^eB=ZU`Dj^8gl|6=O3#{10Q zrn3omb*D8{^p>of#r4j4uho>FOo#Z)_g+b7mT-F8BwNO~J7VSjOOv?3>|MotK)BQ@2*G#UH?vJGB{S@r8+xYImGV_L<+SvOHF&~ee z=6WiBHT$dEgu8FUB$qk;@Q!_%!ai?iYW9?syt}4IEm!+IUtVUr*fy=*(Rl?^xewev zBiI>GTy}V2?4N__DL=n6xi{G@S6ivmwJ$rx%;r%K$CS&8dt*-RI=%nEL}lyUdT)8I z=c)Xu$zqZDTlSs*;$(;0uSHi0K5%yx%xSIKaYnM1!)3z{hp@JU_inkn-J8qT#NYJd zc96bWBkJ-obVmq$%okgd=@yb8X>htf|1U2qYTl(h!p}B+ z-gw64B|UN9*WX!qKZ(NpS+Al+MeO7`*u$HJbUQv-6?Uh`dy{wicE`o`_He^~{? zA)DE5UpU#WKaQLHcOT1LFX=1%cPfwFwLbbtOIUIFsREC@!onk+bp=W#`=es{3l0bW zXpGRzJCQfRRORm9TmAyixBR`O#M-))tM92S>#eT#BN^HuJ*sSfH}7ioYtJ&x>d!3} zJyjRIv;Kx_K=c=dt#Yq>p5EmYyLnhjP;b?tm2T0!x7{6_<|=FV+466izede==Zke%e>M2am!uWbg}Tlr{FR+%INSD@LK-O?Ep#h3urN&r?n-JnQCO zWVqc)e|P8c6rnk*OHE4LrD96#W^Oc>acTMC(-!!}Q}4{?xL>AseXSdU{jaZ{=P0mm ze`Ln~?*|gQAE&Q->~Q|l`)llvDpgzP_c@kapI ztbe68eO|)eas8;wiF)r+J97#o83eVf&b&0^oWozef9{dC(53}@TBK-&HGpr;DBYlkDpXW-6PA7Pv_6uuKBp6*wA~M*-6<)&knrIZr^uPfU`z#8%OyX z_39gEoc?M`)NQ=~`iFMQQ*+(R$K~!=RUZ3Q$G2B*CyM}IQ(ErzWk@0wWR@z{kuQ=x;Mxz;of3vcJna! z5Xwfr%i&ioK77%yU3Dmh`AG({6VOoOCqe_F4)$X*ni(*BY4ad*L!1Lwj5eHH%x6?yzL-!Vok@ss-+ z|uzL$pb5{q}8_85bBGT%$eL|UNf0aPJgs} zZX~O_eANEL%Nz>M>aVkBr10Mh)A+yR-iqxFJcd2SJT12-?+SY-!x1Nas#oK;$qR+A z&70DMCJFU{A|?Av&ar0OzWF;tSlHErAY5;~UlFhrg`Df5&^Y zE?!*rQ@57sOaH3IkFg33QdjnOKfZaA{fXv|chmR0uF$G#&B-c((evuC@uLwtLgN+IGCjZ5N;0dgx12>(2WO zZ;vV`tqIKvTI^tcku{5rC6DL-(yI&__ZPe>F8$VUZxQ>-t#?Y4{$JmCLhf2ON1&|V z*4t58zoRDvd_7TqT#o7H_Kroi5j-iYWYpaqqn2v_^t}Es;OUFF)xVlH<~@9I$Wmd= zQtsdV3C0oit*()Eao48AJ4e-=I&s9UV9CXE=F_gQY`yv-vO;u)tMbLS@>7gm_9#zt zbewueFY@k#35BnhbDwfN_eSUUmbD6YI*TH0y~Qtj+h|^X@aOXJd-p!F#M~);bbIe= zhbv<9?}^M1E1kr|=yS=rq_iOCq0Pa)iY@VZ*Y@5oDu{V0^Zc6B7ZKYabB#wu?|CLW z{`Z(8d|V+t?bnGOnU0qNSId8%p71^R+N(FKz$ZQbV_!ODVcQD6s1=E?LM{HBe6=jQ zR&nXOpY!$P_D@}S$Lz(w|H+`;o0UDTXM~@-sLYWoTk+9Ne#f7mGxd|}SuO_s)40vp zx@_7d*<{0x%0-LsaHf09M()>T*4tb1YHh8#gNcZ7N^RGjhK}~5+K<#v%%41c`dy(% z_wHOvSlDpq_$IMCFE}0rZ*-G5lOC~UbILLUo7-0&X9}{^;}izFxJ#fz~I@hm+--ez5I+^sS=l%Ove5=kM%&b8u4Q&b8;s{w6d5+^@c5`rp=go)>2Lo1jW_Pzz8AfL?a#gM z@sc6TGV8407U%N(vOe}wZu>v}+*d+>}UL=|FZs$g`O5G#xZrRme5(>WwGlX3b3D?|k_@TIO7PaBOGke_Z>VcO#f}1k*=`#a_M>P zZpSr3FE?G^U%%Nk`(uv;TWj|x{U_mV&3vcTTE++adIx@tB9F2$1nG(d285raQgpY(Dw?KJadfu z&4$B*E)#xurX5;&V8;3DZ=0sLO%I=&$8F@jPjhcW(3GuN2lhJ%>P0nfGTxVD!+Ko( zjqQ$4QXxN$N~%A*J^0p>zHmMB3guU&k1G=-cuSaGsF$?Z@!Kpr{5A7JbIArfzF z&hkvZvg%ExOTy=_3~zYnuDVyaA|m|iY=`d`_GRh5Xsw!jk6+LEPJYGt#s)XjLsB^{ zi@nSD?tJ5Vz|Y1(@&7-aMXuj2L_9m?UGR0|kGyp8gN5gNXK%M~DDc|dxi-3)FKl_J z+JqyVevF;JRF*r$KT|p0nBrH&mD2J?nOpJUr;DP;za7}=SS@dFAbiANr{A|D*I4&> z=Xh%5fbZ?-O}x1waq*D^;|Q~y8ybc;c&716n|bk=HK!hK>lJD~n?ObBKl08_QwyUH TiELwFU|{fc^>bP0l+XkKAW{-T literal 0 HcmV?d00001 From 1b8971aa20f222a32745075a89606fa34d9a1a22 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 7 Mar 2026 21:41:53 -0500 Subject: [PATCH 153/232] Moving to unstable branch as test removed unneeded overlays --- flake.lock | 42 +++++++++++++++++++++--------------------- modules/core/steam.nix | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 5d4d2cf..4d6a7cf 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1772177232, - "narHash": "sha256-wVhLe9vJEoOf0mx+Z9CrynLm360oqXKMUVt+F6FGIlk=", + "lastModified": 1772867847, + "narHash": "sha256-nIXWsnURXPqK4bAwYciu0bLzxHGB9UsmhOmQdeLpegk=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "df7c7f6471154ec826aed1aefd8cd94e9002ad26", + "rev": "a610db44f5c24da9cbde3bbd22f1dd4690d9553e", "type": "github" }, "original": { @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1772633327, - "narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=", + "lastModified": 1772845525, + "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", "owner": "nix-community", "repo": "home-manager", - "rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc", + "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772542754, - "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -380,11 +380,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772659442, - "narHash": "sha256-F1oSoSwGvBiqtSfGU9YzsjL9sP6IQDYQeUIQbXma70U=", + "lastModified": 1772925400, + "narHash": "sha256-I0Gb+CO6bXi1U5PYgCqnuvI1B+R9kZtamLwhVvOywSo=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "c56fa106b7d8c6ae3034ce6d706bc35432ac9ea6", + "rev": "5f319987a5003c383678f4aae0cf71f78c7ea49e", "type": "github" }, "original": { @@ -401,11 +401,11 @@ ] }, "locked": { - "lastModified": 1772227064, - "narHash": "sha256-f821ZSoGpa/aXrWq0gPpea9qBnX8KDyavGKkptz2Mog=", + "lastModified": 1772673824, + "narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "0741d27d2f7db567270f139c5d1684614ecf9863", + "rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1772651509, - "narHash": "sha256-1ebULhLszxw6dMK0BYQTk1mLG6vdpGBUThVv+0/lFrE=", + "lastModified": 1772875143, + "narHash": "sha256-ENBRe7vCCp/SIG2WRKI2pyAxwnrc9CPuwZ4CtMu4KU4=", "owner": "notashelf", "repo": "nvf", - "rev": "ce82d185882929babb294b39342009f8e1e0575a", + "rev": "6681e33727409d4ccfa687de981b594110a735d6", "type": "github" }, "original": { @@ -636,11 +636,11 @@ ] }, "locked": { - "lastModified": 1772638901, - "narHash": "sha256-kzAyU054Mzpnzgx475MgmcjYJXxXWQWBG7LLsYtHXKw=", + "lastModified": 1772858378, + "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "75de12ddd50616a3628499ec18b648bceb88eb0d", + "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9", "type": "github" }, "original": { diff --git a/modules/core/steam.nix b/modules/core/steam.nix index 7ced7eb..a23ae9b 100644 --- a/modules/core/steam.nix +++ b/modules/core/steam.nix @@ -6,7 +6,7 @@ lib.mkIf pkgs.stdenv.hostPlatform.isx86_64 { programs = { steam = { - enable = true; + enable = false; remotePlay.openFirewall = true; dedicatedServer.openFirewall = false; gamescopeSession.enable = true; From f9caa871973cf118388f0bfedbd325cf6086957d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 8 Mar 2026 13:32:35 -0400 Subject: [PATCH 154/232] Removed old host --- flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake.nix b/flake.nix index cac001d..b003920 100644 --- a/flake.nix +++ b/flake.nix @@ -74,7 +74,6 @@ hosts = [ "zaneyos-next" "default" - "nixstation" "zaneyos-24-vm" "zaneyos-oem" ]; From 8513395fd92884e8cb49c6ee29c5760b61b299fa Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 10 Mar 2026 23:44:37 -0400 Subject: [PATCH 155/232] Updated flake --- flake.lock | 56 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 4d6a7cf..70af22f 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1772867847, - "narHash": "sha256-nIXWsnURXPqK4bAwYciu0bLzxHGB9UsmhOmQdeLpegk=", + "lastModified": 1773127477, + "narHash": "sha256-ySK+g4eGkaZg4KM116bKWQ9Guq6EihLkOZiSNnPJF5U=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "a610db44f5c24da9cbde3bbd22f1dd4690d9553e", + "rev": "2386c4ae3d41c438135b50d23009c5b73ce55ff5", "type": "github" }, "original": { @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1772845525, - "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", + "lastModified": 1773179137, + "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=", "owner": "nix-community", "repo": "home-manager", - "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", + "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772773019, - "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { @@ -380,11 +380,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772925400, - "narHash": "sha256-I0Gb+CO6bXi1U5PYgCqnuvI1B+R9kZtamLwhVvOywSo=", + "lastModified": 1773196620, + "narHash": "sha256-2+oZquEDg+5YLxXmEF3R0Kz40gJNLast6JLRgXFGzjs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "5f319987a5003c383678f4aae0cf71f78c7ea49e", + "rev": "13f0b8fce4588bd17c99b53d9cba6d73defed0c2", "type": "github" }, "original": { @@ -398,14 +398,15 @@ "nixpkgs": [ "noctalia", "nixpkgs" - ] + ], + "systems": "systems_2" }, "locked": { - "lastModified": 1772673824, - "narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=", + "lastModified": 1773175685, + "narHash": "sha256-YOkWzVq7opym1ovJvSCvqpG6OCDGJwPo/EPeRxcGay4=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690", + "rev": "6b9eceefde3d47ca83c544b54bcdd358be4cbd2f", "type": "github" }, "original": { @@ -453,11 +454,11 @@ ] }, "locked": { - "lastModified": 1772875143, - "narHash": "sha256-ENBRe7vCCp/SIG2WRKI2pyAxwnrc9CPuwZ4CtMu4KU4=", + "lastModified": 1773176554, + "narHash": "sha256-i7lgK73pvk5ClHgfVEeIiHFM1S2kjeCF2uvODf2oKlE=", "owner": "notashelf", "repo": "nvf", - "rev": "6681e33727409d4ccfa687de981b594110a735d6", + "rev": "d057f50cc4ce26d5f8a43cd8ea16a0ac7805b228", "type": "github" }, "original": { @@ -476,7 +477,7 @@ "noctalia": "noctalia", "nvf": "nvf", "stylix": "stylix", - "systems": "systems_2", + "systems": "systems_3", "zen-browser": "zen-browser" } }, @@ -547,6 +548,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { From 0a3e015b22fdf62f71b270cbde6e3fc6bd5f3e27 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 13 Mar 2026 04:29:34 -0400 Subject: [PATCH 156/232] 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 --- README.md | 11 ++++---- cheatsheets/add-gnome.md | 58 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 cheatsheets/add-gnome.md diff --git a/README.md b/README.md index b11d779..375ced2 100644 --- a/README.md +++ b/README.md @@ -291,8 +291,8 @@ cp -r hosts/default hosts/ git add . ``` -4. Edit `hosts//variab - nixos-generate-config --show-hardware-config > hosts//hardware.nix +4. Edit `hosts//variables.nix` + ```nixos-generate-config --show-hardware-config > hosts//hardware.nix``` ``` @@ -310,14 +310,13 @@ 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. -
- ### 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! diff --git a/cheatsheets/add-gnome.md b/cheatsheets/add-gnome.md new file mode 100644 index 0000000..b36cdc5 --- /dev/null +++ b/cheatsheets/add-gnome.md @@ -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//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` From 856ea7d37b62e641b0cead05914c37eb4926b1b9 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 13 Mar 2026 04:36:33 -0400 Subject: [PATCH 157/232] Updated salutaions and URLs --- README.es.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.es.md b/README.es.md index 5153115..1e83376 100644 --- a/README.es.md +++ b/README.es.md @@ -295,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! From 36a3b1e989dc0302dfc9233b5b0874e5471d36b2 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 02:07:14 -0400 Subject: [PATCH 158/232] Added bugsvim to zos-next On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: hosts/default/variables.nix modified: hosts/zaneyos-24-vm/variables.nix modified: hosts/zaneyos-next/variables.nix modified: hosts/zaneyos-oem/variables.nix modified: modules/home/default.nix new file: modules/home/editors/bugsvim-nvim/.luacheckrc new file: modules/home/editors/bugsvim-nvim/.luarc.json new file: modules/home/editors/bugsvim-nvim/.stylua.toml new file: modules/home/editors/bugsvim-nvim/init.lua new file: modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua new file: modules/home/editors/bugsvim-nvim/lua/config/globals.lua new file: modules/home/editors/bugsvim-nvim/lua/config/keymaps.lua new file: modules/home/editors/bugsvim-nvim/lua/config/lazy.lua new file: modules/home/editors/bugsvim-nvim/lua/config/options.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/blink-cmp.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/colortheme.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/conform.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/gitsigns.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/lazydev.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/lualine.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/markdown-preview.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/markdown.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/mini-nvim.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/noice.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/nvim-dap.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lint.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lspconfig.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/nvim-treesitter.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/persistance.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/snacks.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/todo-comments.lua new file: modules/home/editors/bugsvim-nvim/lua/plugins/which-key.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/bashls.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/clangd.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/cssls.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/html.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/hyprls.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/init.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/lua_ls.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/nil_ls.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/pyright.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/rust_analyzer.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/tailwindcss.lua new file: modules/home/editors/bugsvim-nvim/lua/servers/ts_ls.lua new file: modules/home/editors/bugsvim-nvim/lua/utils/diagnostics.lua new file: modules/home/editors/bugsvim-nvim/lua/utils/lsp.lua new file: modules/home/editors/bugsvim.nix modified: modules/options.nix --- hosts/default/variables.nix | 2 + hosts/zaneyos-24-vm/variables.nix | 2 + hosts/zaneyos-next/variables.nix | 2 + hosts/zaneyos-oem/variables.nix | 2 + modules/home/default.nix | 15 +- modules/home/editors/bugsvim-nvim/.luacheckrc | 14 ++ modules/home/editors/bugsvim-nvim/.luarc.json | 5 + .../home/editors/bugsvim-nvim/.stylua.toml | 6 + modules/home/editors/bugsvim-nvim/init.lua | 1 + .../bugsvim-nvim/lua/config/autocmds.lua | 91 ++++++++ .../bugsvim-nvim/lua/config/globals.lua | 7 + .../bugsvim-nvim/lua/config/keymaps.lua | 49 +++++ .../editors/bugsvim-nvim/lua/config/lazy.lua | 48 +++++ .../bugsvim-nvim/lua/config/options.lua | 108 ++++++++++ .../bugsvim-nvim/lua/plugins/blink-cmp.lua | 61 ++++++ .../bugsvim-nvim/lua/plugins/colortheme.lua | 16 ++ .../bugsvim-nvim/lua/plugins/conform.lua | 54 +++++ .../bugsvim-nvim/lua/plugins/gitsigns.lua | 73 +++++++ .../bugsvim-nvim/lua/plugins/lazydev.lua | 18 ++ .../bugsvim-nvim/lua/plugins/lualine.lua | 97 +++++++++ .../lua/plugins/markdown-preview.lua | 22 ++ .../bugsvim-nvim/lua/plugins/markdown.lua | 19 ++ .../bugsvim-nvim/lua/plugins/mini-nvim.lua | 36 ++++ .../bugsvim-nvim/lua/plugins/noice.lua | 31 +++ .../bugsvim-nvim/lua/plugins/nvim-dap.lua | 87 ++++++++ .../bugsvim-nvim/lua/plugins/nvim-lint.lua | 27 +++ .../lua/plugins/nvim-lspconfig.lua | 38 ++++ .../lua/plugins/nvim-treesitter.lua | 110 ++++++++++ .../bugsvim-nvim/lua/plugins/persistance.lua | 19 ++ .../bugsvim-nvim/lua/plugins/snacks.lua | 196 ++++++++++++++++++ .../lua/plugins/todo-comments.lua | 21 ++ .../bugsvim-nvim/lua/plugins/which-key.lua | 23 ++ .../bugsvim-nvim/lua/servers/bashls.lua | 14 ++ .../bugsvim-nvim/lua/servers/clangd.lua | 18 ++ .../bugsvim-nvim/lua/servers/cssls.lua | 16 ++ .../editors/bugsvim-nvim/lua/servers/html.lua | 16 ++ .../bugsvim-nvim/lua/servers/hyprls.lua | 16 ++ .../editors/bugsvim-nvim/lua/servers/init.lua | 33 +++ .../bugsvim-nvim/lua/servers/lua_ls.lua | 27 +++ .../bugsvim-nvim/lua/servers/nil_ls.lua | 16 ++ .../bugsvim-nvim/lua/servers/pyright.lua | 24 +++ .../lua/servers/rust_analyzer.lua | 21 ++ .../bugsvim-nvim/lua/servers/tailwindcss.lua | 21 ++ .../bugsvim-nvim/lua/servers/ts_ls.lua | 47 +++++ .../bugsvim-nvim/lua/utils/diagnostics.lua | 47 +++++ .../editors/bugsvim-nvim/lua/utils/lsp.lua | 44 ++++ modules/home/editors/bugsvim.nix | 76 +++++++ modules/options.nix | 5 + 48 files changed, 1737 insertions(+), 4 deletions(-) create mode 100644 modules/home/editors/bugsvim-nvim/.luacheckrc create mode 100644 modules/home/editors/bugsvim-nvim/.luarc.json create mode 100644 modules/home/editors/bugsvim-nvim/.stylua.toml create mode 100644 modules/home/editors/bugsvim-nvim/init.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/config/globals.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/config/keymaps.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/config/lazy.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/config/options.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/blink-cmp.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/colortheme.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/conform.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/gitsigns.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/lazydev.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/lualine.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/markdown-preview.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/markdown.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/mini-nvim.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/noice.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/nvim-dap.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lint.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lspconfig.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/nvim-treesitter.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/persistance.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/snacks.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/todo-comments.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/which-key.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/bashls.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/clangd.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/cssls.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/html.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/hyprls.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/init.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/lua_ls.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/nil_ls.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/pyright.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/rust_analyzer.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/tailwindcss.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/ts_ls.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/utils/diagnostics.lua create mode 100644 modules/home/editors/bugsvim-nvim/lua/utils/lsp.lua create mode 100644 modules/home/editors/bugsvim.nix diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index b256d24..69fe423 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -36,6 +36,8 @@ _: { helixEnable = false; #To install: Enable here, zcli rebuild, then run zcli doom install doomEmacsEnable = false; + # Neovim config: "nixvim" | "nvf" | "bugsvim" + neovimConfig = "nixvim"; # Bar/Shell Settings # Choose between noctalia or waybar diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix index 30d94d9..f6e2d97 100644 --- a/hosts/zaneyos-24-vm/variables.nix +++ b/hosts/zaneyos-24-vm/variables.nix @@ -36,6 +36,8 @@ _: { helixEnable = true; #To install: Enable here, zcli rebuild, then run zcli doom install doomEmacsEnable = true; + # Neovim config: "nixvim" | "nvf" | "bugsvim" + neovimConfig = "nixvim"; # Python development tools pythonEnable = true; diff --git a/hosts/zaneyos-next/variables.nix b/hosts/zaneyos-next/variables.nix index 356a233..002dad3 100644 --- a/hosts/zaneyos-next/variables.nix +++ b/hosts/zaneyos-next/variables.nix @@ -36,6 +36,8 @@ _: { helixEnable = true; #To install: Enable here, zcli rebuild, then run zcli doom install doomEmacsEnable = true; + # Neovim config: "nixvim" | "nvf" | "bugsvim" + neovimConfig = "bugsvim"; # Bar/Shell Settings # Choose between noctalia or waybar diff --git a/hosts/zaneyos-oem/variables.nix b/hosts/zaneyos-oem/variables.nix index 757f689..c778f9c 100644 --- a/hosts/zaneyos-oem/variables.nix +++ b/hosts/zaneyos-oem/variables.nix @@ -31,6 +31,8 @@ _: { helixEnable = true; #To install rebuild, then run zcli doom install doomEmacsEnable = false; + # Neovim config: "nixvim" | "nvf" | "bugsvim" + neovimConfig = "nixvim"; # Hyprland Settings extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1"; diff --git a/modules/home/default.nix b/modules/home/default.nix index 7ba343f..5875672 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,5 +1,6 @@ {zaneyos, ...}: let inherit (zaneyos) barChoice waybarChoice; + neovimConfig = zaneyos.neovimConfig or "nixvim"; # Select bar module based on barChoice barModule = @@ -7,7 +8,8 @@ then ./noctalia.nix else waybarChoice; in { - imports = [ + imports = + [ ./terminals/alacritty.nix ./amfora.nix ./editors/antigravity.nix @@ -35,8 +37,6 @@ in { ./terminals/kitty.nix ./cli/lazygit.nix ./obs-studio.nix - #./editors/nvf.nix - ./editors/nixvim.nix ./editors/nano.nix ./rofi ./qt.nix @@ -57,5 +57,12 @@ in { ./zen-browser.nix ./zoxide.nix ./zsh - ]; + ] + ++ ( + if neovimConfig == "nixvim" + then [./editors/nixvim.nix] + else if neovimConfig == "bugsvim" + then [./editors/bugsvim.nix] + else [./editors/nvf.nix] + ); } diff --git a/modules/home/editors/bugsvim-nvim/.luacheckrc b/modules/home/editors/bugsvim-nvim/.luacheckrc new file mode 100644 index 0000000..588084d --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/.luacheckrc @@ -0,0 +1,14 @@ +globals = { + 'vim', + 'Snacks', +} + +read_globals = { + 'use', +} + +ignore = { + '212', -- Unused argument (common in callbacks) + '213', -- Unused loop variable + '631', -- Line is too long (if you prefer longer lines) +} diff --git a/modules/home/editors/bugsvim-nvim/.luarc.json b/modules/home/editors/bugsvim-nvim/.luarc.json new file mode 100644 index 0000000..e310e5a --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/.luarc.json @@ -0,0 +1,5 @@ +{ + "diagnostics.disable": [ + "missing-parameter" + ] +} diff --git a/modules/home/editors/bugsvim-nvim/.stylua.toml b/modules/home/editors/bugsvim-nvim/.stylua.toml new file mode 100644 index 0000000..139e939 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/.stylua.toml @@ -0,0 +1,6 @@ +column_width = 160 +line_endings = "Unix" +indent_type = "Spaces" +indent_width = 2 +quote_style = "AutoPreferSingle" +call_parentheses = "None" diff --git a/modules/home/editors/bugsvim-nvim/init.lua b/modules/home/editors/bugsvim-nvim/init.lua new file mode 100644 index 0000000..7e3da95 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/init.lua @@ -0,0 +1 @@ +require 'config.lazy' diff --git a/modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua b/modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua new file mode 100644 index 0000000..a3ef1e7 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua @@ -0,0 +1,91 @@ +-- ================================================================================================ +-- TITLE : auto-commands +-- ABOUT : automatically run code on defined events (e.g. save, yank) +-- ================================================================================================ + +-- Disable some mini plugins for snacks dashboard buffer +vim.api.nvim_create_autocmd('User', { + pattern = 'SnacksDashboardOpened', + callback = function(args) + vim.b[args.buf].minitrailspace_disable = true + vim.b[args.buf].minicursorword_disable = true + end, +}) + +-- Restore last cursor position when reopening a file +local last_cursor_group = vim.api.nvim_create_augroup('LastCursorGroup', {}) +vim.api.nvim_create_autocmd('BufReadPost', { + group = last_cursor_group, + callback = function() + local mark = vim.api.nvim_buf_get_mark(0, '"') + local lcount = vim.api.nvim_buf_line_count(0) + if mark[1] > 0 and mark[1] <= lcount then + pcall(vim.api.nvim_win_set_cursor, 0, mark) + end + end, +}) + +-- Highlight the yanked text for 200ms +local highlight_yank_group = vim.api.nvim_create_augroup('HighlightYank', {}) +vim.api.nvim_create_autocmd('TextYankPost', { + group = highlight_yank_group, + pattern = '*', + callback = function() + vim.hl.on_yank { + higroup = 'IncSearch', + timeout = 200, + } + end, +}) + +-- On attach for lsp +local on_attach = require('utils.lsp').on_attach +local lsp_on_attach_group = vim.api.nvim_create_augroup('LspMappings', {}) +vim.api.nvim_create_autocmd('LspAttach', { + group = lsp_on_attach_group, + callback = on_attach, +}) + +-- Pretty lsp progress notification +---@type table +local progress = vim.defaulttable() +vim.api.nvim_create_autocmd('LspProgress', { + ---@param ev {data: {client_id: integer, params: lsp.ProgressParams}} + callback = function(ev) + local client = vim.lsp.get_client_by_id(ev.data.client_id) + local value = ev.data.params.value --[[@as {percentage?: number, title?: string, message?: string, kind: "begin" | "report" | "end"}]] + if not client or type(value) ~= 'table' then + return + end + local p = progress[client.id] + + for i = 1, #p + 1 do + if i == #p + 1 or p[i].token == ev.data.params.token then + p[i] = { + token = ev.data.params.token, + msg = ('[%3d%%] %s%s'):format( + value.kind == 'end' and 100 or value.percentage or 100, + value.title or '', + value.message and (' **%s**'):format(value.message) or '' + ), + done = value.kind == 'end', + } + break + end + end + + local msg = {} ---@type string[] + progress[client.id] = vim.tbl_filter(function(v) + return table.insert(msg, v.msg) or not v.done + end, p) + + local spinner = { '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏' } + vim.notify(table.concat(msg, '\n'), 'info', { + id = 'lsp_progress', + title = client.name, + opts = function(notif) + notif.icon = #progress[client.id] == 0 and ' ' or spinner[math.floor(vim.uv.hrtime() / (1e6 * 80)) % #spinner + 1] + end, + }) + end, +}) diff --git a/modules/home/editors/bugsvim-nvim/lua/config/globals.lua b/modules/home/editors/bugsvim-nvim/lua/config/globals.lua new file mode 100644 index 0000000..61117a3 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/config/globals.lua @@ -0,0 +1,7 @@ +-- ================================================================================================ +-- TITLE : globals +-- ABOUT : Setting up our global and local leader +-- ================================================================================================ + +vim.g.mapleader = ' ' +vim.g.maplocalleader = ' ' diff --git a/modules/home/editors/bugsvim-nvim/lua/config/keymaps.lua b/modules/home/editors/bugsvim-nvim/lua/config/keymaps.lua new file mode 100644 index 0000000..06f4d94 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/config/keymaps.lua @@ -0,0 +1,49 @@ +-- ================================================================================================ +-- TITLE: NeoVim keymaps +-- ABOUT: sets some quality-of-life keymaps +-- ================================================================================================ + +-- Center screen when jumping +vim.keymap.set('n', 'n', 'nzzzv', { desc = 'Next search result (centered)' }) +vim.keymap.set('n', 'N', 'Nzzzv', { desc = 'Previous search result (centered)' }) +vim.keymap.set('n', '', 'zz', { desc = 'Half page down (centered)' }) +vim.keymap.set('n', '', 'zz', { desc = 'Half page up (centered)' }) + +-- Buffer navigation +vim.keymap.set('n', 'bn', 'bnext', { desc = 'Next buffer' }) +vim.keymap.set('n', 'bp', 'bprevious', { desc = 'Previous buffer' }) +vim.keymap.set('n', '', 'bnext', { desc = 'Next buffer' }) +vim.keymap.set('n', '', 'bprevious', { desc = 'Previous buffer' }) + +-- Better window navigation +vim.keymap.set('n', '', 'h', { desc = 'Move to left window' }) +vim.keymap.set('n', '', 'j', { desc = 'Move to bottom window' }) +vim.keymap.set('n', '', 'k', { desc = 'Move to top window' }) +vim.keymap.set('n', '', 'l', { desc = 'Move to right window' }) + +-- Splitting & Resizing +vim.keymap.set('n', 'sv', 'vsplit', { desc = 'Split window vertically' }) +vim.keymap.set('n', 'sh', 'split', { desc = 'Split window horizontally' }) +vim.keymap.set('n', '', 'resize +2', { desc = 'Increase window height' }) +vim.keymap.set('n', '', 'resize -2', { desc = 'Decrease window height' }) +vim.keymap.set('n', '', 'vertical resize -2', { desc = 'Decrease window width' }) +vim.keymap.set('n', '', 'vertical resize +2', { desc = 'Increase window width' }) + +-- Better indenting in visual mode +vim.keymap.set('v', '<', '', '>gv', { desc = 'Indent right and reselect' }) + +-- Better J behavior +vim.keymap.set('n', 'J', 'mzJ`z', { desc = 'Join lines and keep cursor position' }) + +-- Keep last yanked when pasting +vim.keymap.set('v', 'p', '"_dP', { noremap = true, silent = true }) + +-- Quick config editing +vim.keymap.set('n', 'rc', 'e ~/.config/nvim/init.lua', { desc = 'Edit config' }) + +-- Markdown keymaps +vim.keymap.set('n', 'mc', 'MarkdownCheckbox', { desc = 'Toggle markdown checkbox' }) +vim.keymap.set('n', 'mp', 'MarkdownPreview', { desc = 'Open markdown preview' }) +vim.keymap.set('n', 'mt', 'MarkdownPreviewToggle', { desc = 'Toggle markdown preview' }) +vim.keymap.set('n', 'ms', 'MarkdownPreviewStop', { desc = 'Stop markdown preview' }) diff --git a/modules/home/editors/bugsvim-nvim/lua/config/lazy.lua b/modules/home/editors/bugsvim-nvim/lua/config/lazy.lua new file mode 100644 index 0000000..599967d --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/config/lazy.lua @@ -0,0 +1,48 @@ +-- ================================================================================================ +-- TITLE: installing lazy plugin manager +-- ABOUT: Bootstarp and configure lazy.nvim plugin manager +-- ================================================================================================ + +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = 'https://github.com/folke/lazy.nvim.git' + local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { 'Failed to clone lazy.nvim:\n', 'ErrorMsg' }, + { out, 'WarningMsg' }, + { '\nPress any key to exit...' }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +require 'config.options' +require 'config.globals' +require 'config.keymaps' +require 'config.autocmds' + +-- Setup diagnostics +require('utils.diagnostics').setup() + +-- Setup lazy.nvim +require('lazy').setup { + spec = { + -- import your plugins + { import = 'plugins' }, + }, + rtp = { + disabled_plugins = { + 'netrw', + 'netrwPlugin', + }, + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + install = { colorscheme = { 'tokyonight-night' } }, + -- automatically check for plugin updates + checker = { enabled = true }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/config/options.lua b/modules/home/editors/bugsvim-nvim/lua/config/options.lua new file mode 100644 index 0000000..f276246 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/config/options.lua @@ -0,0 +1,108 @@ +-- ================================================================================================ +-- TITLE : NeoVim options +-- ABOUT : basic settings native to neovim +-- ================================================================================================ + +-- Basic Settings +vim.opt.number = true -- Line numbers +vim.opt.relativenumber = false -- Relative line numbers +vim.opt.cursorline = true -- Highlight current line +vim.opt.scrolloff = 10 -- Keep 10 lines above/below cursor +vim.opt.sidescrolloff = 8 -- Keep 8 columns left/right of cursor +vim.opt.wrap = false -- Don't wrap lines +vim.opt.cmdheight = 1 -- Command line height +vim.opt.spelllang = { 'en', 'de' } -- Set language for spellchecking + +-- Tabbing / Indentation +vim.opt.tabstop = 2 -- Tab width +vim.opt.shiftwidth = 2 -- Indent width +vim.opt.softtabstop = 2 -- Soft tab stop +vim.opt.expandtab = true -- Use spaces instead of tabs +vim.opt.smartindent = true -- Smart auto-indenting +vim.opt.autoindent = true -- Copy indent from current line +vim.opt.grepprg = 'rg --vimgrep' -- Use ripgrep if available +vim.opt.grepformat = '%f:%l:%c:%m' -- filename, line number, column, content + +-- Search Settings +vim.opt.ignorecase = true -- Case-insensitive search +vim.opt.smartcase = true -- Case-sensitive if uppercase in search +vim.opt.hlsearch = false -- Don't highlight search results +vim.opt.incsearch = true -- Show matches as you type + +-- Visual Settings +vim.opt.termguicolors = true -- Enable 24-bit colors +vim.opt.signcolumn = 'yes' -- Always show sign column +vim.opt.colorcolumn = '100' -- Show column at 100 characters +vim.opt.showmatch = true -- Highlight matching brackets +vim.opt.matchtime = 2 -- How long to show matching bracket +vim.opt.completeopt = 'menuone,noinsert,noselect' -- Completion options +vim.opt.showmode = false -- Don't show mode in command line +vim.opt.pumheight = 10 -- Popup menu height +vim.opt.pumblend = 10 -- Popup menu transparency +vim.opt.winblend = 0 -- Floating window transparency +vim.opt.conceallevel = 0 -- Don't hide markup +vim.opt.concealcursor = '' -- Show markup even on cursor line +vim.opt.lazyredraw = false -- redraw while executing macros (butter UX) +vim.opt.redrawtime = 10000 -- Timeout for syntax highlighting redraw +vim.opt.maxmempattern = 20000 -- Max memory for pattern matching +vim.opt.synmaxcol = 300 -- Syntax highlighting column limit + +-- File Handling +vim.opt.backup = false -- Don't create backup files +vim.opt.writebackup = false -- Don't backup before overwriting +vim.opt.swapfile = false -- Don't create swap files +vim.opt.undofile = true -- Persistent undo +vim.opt.updatetime = 300 -- Time in ms to trigger CursorHold +vim.opt.timeoutlen = 500 -- Time in ms to wait for mapped sequence +vim.opt.ttimeoutlen = 0 -- No wait for key code sequences +vim.opt.autoread = true -- Auto-reload file if changed outside +vim.opt.autowrite = false -- Don't auto-save on some events +vim.opt.diffopt:append 'vertical' -- Vertical diff splits +vim.opt.diffopt:append 'algorithm:patience' -- Better diff algorithm +vim.opt.diffopt:append 'linematch:60' -- Better diff highlighting (smart line matching) + +-- Set undo directory and ensure it exists +local undodir = '~/.local/share/nvim/undodir' -- Undo directory path +vim.opt.undodir = vim.fn.expand(undodir) -- Expand to full path +local undodir_path = vim.fn.expand(undodir) +if vim.fn.isdirectory(undodir_path) == 0 then + vim.fn.mkdir(undodir_path, 'p') -- Create if not exists +end + +-- Behavior Settings +vim.opt.errorbells = false -- Disable error sounds +vim.opt.backspace = 'indent,eol,start' -- Make backspace behave naturally +vim.opt.autochdir = false -- Don't change directory automatically +vim.opt.iskeyword:append '-' -- Treat dash as part of a word +vim.opt.path:append '**' -- Search into subfolders with `gf` +vim.opt.selection = 'inclusive' -- Use inclusive selection +vim.opt.mouse = 'a' -- Enable mouse support +vim.opt.clipboard:append 'unnamedplus' -- Use system clipboard +vim.opt.modifiable = true -- Allow editing buffers +vim.opt.encoding = 'UTF-8' -- Use UTF-8 encoding +vim.opt.wildmenu = true -- Enable command-line completion menu +vim.opt.wildmode = 'longest:full,full' -- Completion mode for command-line +vim.opt.wildignorecase = true -- Case-insensitive tab completion in commands + +-- Cursor Settings +vim.opt.guicursor = { + 'n-v-c:block', -- Normal, Visual, Command-line + 'i-ci-ve:block', -- Insert, Command-line Insert, Visual-exclusive + 'r-cr:hor20', -- Replace, Command-line Replace + 'o:hor50', -- Operator-pending + 'a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor', -- All modes: blinking & highlight groups + 'sm:block-blinkwait175-blinkoff150-blinkon175', -- Showmatch mode +} + +-- Folding Settings +vim.opt.foldmethod = 'expr' -- Use expression for folding +vim.opt.foldexpr = 'v:lua.vim.treesitter.foldexpr()' -- Use treesitter for folding +vim.opt.foldlevel = 99 -- Keep all folds open by default + +-- Split Behavior +vim.opt.splitbelow = true -- Horizontal splits open below +vim.opt.splitright = true -- Vertical splits open to the right + +-- List characters +vim.o.list = true -- Enable list +vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } -- Set how listchars will look diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/blink-cmp.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/blink-cmp.lua new file mode 100644 index 0000000..596d0d5 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/blink-cmp.lua @@ -0,0 +1,61 @@ +-- ================================================================================================ +-- TITLE : blink-cmp +-- ABOUT : For autocompletions +-- LINKS : blink.cmp https://github.com/saghen/blink.cmp +-- ================================================================================================ +return { + 'saghen/blink.cmp', + event = 'InsertEnter', + version = '1.*', + dependencies = { + { + 'L3MON4D3/LuaSnip', + version = '2.*', + build = 'make install_jsregexp', + dependencies = { + { + 'rafamadriz/friendly-snippets', + config = function() + require('luasnip.loaders.from_vscode').lazy_load() + end, + }, + }, + opts = { + history = true, + delete_check_events = 'TextChanged', + }, + }, + 'folke/lazydev.nvim', + }, + --- @module 'blink.cmp' + --- @type blink.cmp.Config + opts = { + keymap = { + preset = 'default', + [''] = { 'accept', 'fallback' }, + [''] = { 'select_next', 'fallback' }, + [''] = { 'select_prev', 'fallback' }, + }, + appearance = { + nerd_font_variant = 'mono', + }, + completion = { + documentation = { + auto_show = true, + auto_show_delay_ms = 500, + }, + }, + sources = { + default = { 'lsp', 'path', 'snippets', 'buffer', 'lazydev' }, + providers = { + lazydev = { + module = 'lazydev.integrations.blink', + score_offset = 100, + }, + }, + }, + snippets = { preset = 'luasnip' }, + fuzzy = { implementation = 'prefer_rust_with_warning' }, + signature = { enabled = true }, + }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/colortheme.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/colortheme.lua new file mode 100644 index 0000000..2a2c958 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/colortheme.lua @@ -0,0 +1,16 @@ +-- ================================================================================================ +-- TITLE : tokyonight-nvim +-- ABOUT : A cool dark vivid tokyonight color theme created by folke(the G.O.A.T) +-- LINKS : +-- > github : https://github.com/folke/tokyonight.nvim +-- ================================================================================================ + +return { + 'folke/tokyonight.nvim', + lazy = false, + priority = 1000, + opts = {}, + init = function() + vim.cmd [[colorscheme tokyonight-night]] + end, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/conform.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/conform.lua new file mode 100644 index 0000000..48e6b4e --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/conform.lua @@ -0,0 +1,54 @@ +-- ================================================================================================ +-- TITLE : conform.nvim +-- ABOUT : For auto formatting +-- LINKS : conform.nvim https://github.com/stevearc/conform.nvim +-- ================================================================================================ + +return { + 'stevearc/conform.nvim', + event = { 'BufWritePre' }, + cmd = { 'ConformInfo' }, + keys = { + { + 'cf', + function() + require('conform').format { async = true, lsp_format = 'fallback' } + end, + mode = '', + desc = 'Format buffer', + }, + }, + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + local disable_filetypes = { c = false, cpp = false } + if disable_filetypes[vim.bo[bufnr].filetype] then + return nil + else + return { + timeout_ms = 500, + lsp_format = 'fallback', + } + end + end, + formatters_by_ft = { + lua = { 'stylua' }, + python = { 'ruff_format' }, + javascript = { 'prettierd' }, + javascriptreact = { 'prettierd' }, + typescript = { 'prettierd' }, + typescriptreact = { 'prettierd' }, + html = { 'prettierd' }, + css = { 'prettierd' }, + scss = { 'prettierd' }, + json = { 'prettierd' }, + jsonc = { 'prettierd' }, + markdown = { 'prettierd' }, + yaml = { 'prettierd' }, + c = { 'clang-format' }, + cpp = { 'clang-format' }, + bash = { 'shfmt' }, + nix = { 'alejandra' }, + }, + }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/gitsigns.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/gitsigns.lua new file mode 100644 index 0000000..c5f979c --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/gitsigns.lua @@ -0,0 +1,73 @@ +-- ================================================================================================ +-- TITLE : gitsigns.nvim +-- LINKS : +-- > github : https://github.com/lewis6991/gitsigns.nvim +-- ABOUT : Deep buffer integration for Git +-- ================================================================================================ + +return { + 'lewis6991/gitsigns.nvim', + event = { 'BufReadPre', 'BufNewFile' }, + opts = { + signs = { + add = { text = '▎' }, + change = { text = '▎' }, + delete = { text = '' }, + topdelete = { text = '' }, + changedelete = { text = '▎' }, + untracked = { text = '▎' }, + }, + signs_staged = { + add = { text = '▎' }, + change = { text = '▎' }, + delete = { text = '' }, + topdelete = { text = '' }, + changedelete = { text = '▎' }, + }, + on_attach = function(buffer) + local gs = package.loaded.gitsigns + + local function map(mode, l, r, desc) + vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc, silent = true }) + end + + -- stylua: ignore start + map("n", "]h", function() + if vim.wo.diff then + vim.cmd.normal({ "]c", bang = true }) + else + gs.nav_hunk("next") + end + end, "Next Hunk") + map("n", "[h", function() + if vim.wo.diff then + vim.cmd.normal({ "[c", bang = true }) + else + gs.nav_hunk("prev") + end + end, "Prev Hunk") + map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk") + map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk") + map({ "n", "x" }, "ghs", ":Gitsigns stage_hunk", "Stage Hunk") + map({ "n", "x" }, "ghr", ":Gitsigns reset_hunk", "Reset Hunk") + map("n", "ghS", gs.stage_buffer, "Stage Buffer") + map("n", "ghu", gs.undo_stage_hunk, "Undo Stage Hunk") + map("n", "ghR", gs.reset_buffer, "Reset Buffer") + map("n", "ghp", gs.preview_hunk_inline, "Preview Hunk Inline") + map("n", "ghb", function() gs.blame_line({ full = true }) end, "Blame Line") + map("n", "ghB", function() gs.blame() end, "Blame Buffer") + map("n", "ghd", gs.diffthis, "Diff This") + map("n", "ghD", function() gs.diffthis("~") end, "Diff This ~") + map({ "o", "x" }, "ih", ":Gitsigns select_hunk", "GitSigns Select Hunk") + Snacks.toggle({ + name = "Git Signs", + get = function() + return require("gitsigns.config").config.signcolumn + end, + set = function(state) + require("gitsigns").toggle_signs(state) + end, + }):map("uG") + end, + }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/lazydev.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/lazydev.lua new file mode 100644 index 0000000..952d99f --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/lazydev.lua @@ -0,0 +1,18 @@ +-- ================================================================================================ +-- TITLE : Lazydev nvim +-- ABOUT : For faster lua_ls startup +-- LINKS : lazydev.nvim : https://github.com/folke/lazydev.nvim +-- ================================================================================================ + +return { + 'folke/lazydev.nvim', + ft = 'lua', + opts = { + library = { + -- Load luvit types when the `vim.uv` word is found + { path = '${3rd}/luv/library', words = { 'vim%.uv' } }, + -- Add snacks types + { path = 'snacks.nvim', words = { 'Snacks', 'snacks.Config' } }, + }, + }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/lualine.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/lualine.lua new file mode 100644 index 0000000..3230cb0 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/lualine.lua @@ -0,0 +1,97 @@ +-- ================================================================================================ +-- TITLE : lualine.nvim +-- LINKS : +-- > github : https://github.com/nvim-lualine/lualine.nvim +-- ABOUT : A blazing fast and easy to configure Neovim statusline written in Lua. +-- ================================================================================================ +return { + 'nvim-lualine/lualine.nvim', + event = 'VeryLazy', + config = function() + local hide_in_width = function() + return vim.fn.winwidth(0) > 100 + end + + local mode = { + 'mode', + fmt = function(str) + if hide_in_width() then + return ' ' .. str + else + return ' ' .. str:sub(1, 1) -- displays only the first character of the mode + end + end, + } + + local filename = { + 'filename', + file_status = true, -- displays file status (readonly status, modified status) + path = 0, -- 0 = just filename, 1 = relative path, 2 = absolute path + } + + local diagnostics = { + 'diagnostics', + sources = { 'nvim_diagnostic' }, + sections = { 'error', 'warn' }, + symbols = { error = ' ', warn = ' ', info = ' ', hint = ' ' }, + colored = false, + update_in_insert = false, + always_visible = false, + cond = hide_in_width, + } + + local diff = { + 'diff', + colored = false, + symbols = { added = ' ', modified = ' ', removed = ' ' }, -- changes diff symbols + cond = hide_in_width, + } + + require('lualine').setup { + options = { + icons_enabled = true, + theme = 'tokyonight', -- Set theme based on environment variable + -- Some useful glyphs: + -- https://www.nerdfonts.com/cheat-sheet + --         + section_separators = { left = '', right = '' }, + component_separators = { left = '', right = '' }, + disabled_filetypes = { 'snacks_dashboard' }, + always_divide_middle = true, + }, + sections = { + lualine_a = { mode }, + lualine_b = { 'branch' }, + lualine_c = { filename }, + lualine_x = { + Snacks.profiler.status(), + { + require('lazy.status').updates, + cond = require('lazy.status').has_updates, + color = function() + return { fg = Snacks.util.color 'Special' } + end, + }, + diagnostics, + diff, + { 'filetype', cond = hide_in_width }, + { 'encoding', cond = hide_in_width }, + }, + lualine_y = { 'location' }, + lualine_z = { 'progress' }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { { 'filename', path = 1 } }, + lualine_x = { { 'location', padding = 0 } }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = { + lualine_a = { { 'buffers', show_filename_only = true } }, + }, + extensions = { 'fugitive' }, + } + end, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/markdown-preview.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/markdown-preview.lua new file mode 100644 index 0000000..2919650 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/markdown-preview.lua @@ -0,0 +1,22 @@ +-- ================================================================================================ +-- TITLE: markdown-preview.nvim +-- ABOUT: Preview markdown files in browser with live updates +-- LINKS: markdown-preview.nvim https://github.com/iamcco/markdown-preview.nvim +-- ================================================================================================ +return { + "iamcco/markdown-preview.nvim", + cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + ft = { "markdown" }, + init = function() + vim.g.mkdp_auto_start = 0 + vim.g.mkdp_auto_close = 0 + vim.g.mkdp_refresh_slow = 0 + vim.g.mkdp_command_delay = 100 + vim.g.mkdp_open_to_the_world = 0 + vim.g.mkdp_open_ip = "" + vim.g.mkdp_browser = "" + vim.g.mkdp_echo_preview_url = 1 + vim.g.mkdp_page_title = "「${name}」" + vim.g.mkdp_filetypes = { "markdown" } + end, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/markdown.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/markdown.lua new file mode 100644 index 0000000..1ec7402 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/markdown.lua @@ -0,0 +1,19 @@ +-- ================================================================================================ +-- TITLE: markdown.nvim +-- ABOUT: Markdown editing enhancements (tables, checkboxes, lists) +-- LINKS: markdown.nvim https://github.com/tadmccorkle/markdown.nvim +-- ================================================================================================ +return { + "tadmccorkle/markdown.nvim", + ft = "markdown", + opts = { + -- Checkbox options + checkbox = { + enabled = true, + }, + -- Table options + table = { + enabled = true, + }, + }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/mini-nvim.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/mini-nvim.lua new file mode 100644 index 0000000..1fa830f --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/mini-nvim.lua @@ -0,0 +1,36 @@ +-- ================================================================================================ +-- TITLE : mini.nvim +-- LINKS : +-- > github : https://github.com/echasnovski/mini.nvim +-- ABOUT : Library of 40+ independent Lua modules. +-- ================================================================================================ + +return { + { 'echasnovski/mini.ai', version = false, event = 'VeryLazy', opts = {} }, + { 'echasnovski/mini.comment', version = false, event = 'VeryLazy', opts = {} }, + { 'echasnovski/mini.move', version = false, event = 'VeryLazy', opts = {} }, + { 'echasnovski/mini.surround', version = false, event = 'VeryLazy', opts = {} }, + { 'echasnovski/mini.cursorword', version = false, event = 'VeryLazy', opts = {} }, + { 'echasnovski/mini.pairs', version = false, event = 'VeryLazy', opts = {} }, + { 'echasnovski/mini.trailspace', version = false, event = 'VeryLazy', opts = {} }, + -- Set up mini icons and make it act as web-dev icons + { + 'nvim-mini/mini.icons', + lazy = true, + opts = { + file = { + ['.keep'] = { glyph = '󰊢', hl = 'MiniIconsGrey' }, + ['devcontainer.json'] = { glyph = '', hl = 'MiniIconsAzure' }, + }, + filetype = { + dotenv = { glyph = '', hl = 'MiniIconsYellow' }, + }, + }, + init = function() + package.preload['nvim-web-devicons'] = function() + require('mini.icons').mock_nvim_web_devicons() + return package.loaded['nvim-web-devicons'] + end + end, + }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/noice.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/noice.lua new file mode 100644 index 0000000..70fd82e --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/noice.lua @@ -0,0 +1,31 @@ +-- ================================================================================================ +-- TITLE: noice.nvim +-- ABOUT: Displays cmdline and events in popup windows +-- LINKS: noice.nvim https://github.com/folke/noice.nvim +-- nui.nvim https://github.com/MunifTanjim/nui.nvim +-- nvim-notify https://github.com/rcarriga/nvim-notify +-- ================================================================================================ +return { + "folke/noice.nvim", + event = "VeryLazy", + opts = { + lsp = { + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, + }, + }, + presets = { + bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename + lsp_doc_border = false, -- add a border to hover docs and signature help + }, + }, + dependencies = { + "MunifTanjim/nui.nvim", + "rcarriga/nvim-notify", + }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-dap.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-dap.lua new file mode 100644 index 0000000..420d9cf --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-dap.lua @@ -0,0 +1,87 @@ +-- ================================================================================================ +-- TITLE : nvim-dap +-- ABOUT : Debug Adapter Protocol client implementation for Neovim +-- -- LINKS : +-- > github :https://github.com/mfussenegger/nvim-dap +-- > github :https://github.com/rcarriga/nvim-dap-ui +-- > github :https://github.com/nvim-neotest/nvim-nio +-- > github :https://github.com/mfussenegger/nvim-dap-python +-- ================================================================================================ + + +-- Set up icons +-- stylua: ignore start +local icons = { + Stopped = { '', 'DiagnosticWarn', 'DapStoppedLine' }, + Breakpoint = '', + BreakpointCondition = '', + BreakpointRejected = { '', 'DiagnosticError' }, + LogPoint = '󰚃', +} +for name, sign in pairs(icons) do + sign = type(sign) == 'table' and sign or { sign } + vim.fn.sign_define('Dap' .. name, { + text = sign[1] --[[@as string]] .. ' ', + texthl = sign[2] or 'DiagnosticInfo', + linehl = sign[3], + numhl = sign[3], + }) +end +-- stylua: ignore end + +-- Debugging setup +return { + { + 'mfussenegger/nvim-dap', + cmd = { + 'DapContinue', + 'DapStepOver', + 'DapStepInto', + 'DapStepOut', + 'DapToggleBreakpoint', + }, + dependencies = { + 'rcarriga/nvim-dap-ui', + 'nvim-neotest/nvim-nio', + }, + keys = { + -- stylua: ignore start + { 'dt', function() require('dap').toggle_breakpoint() end, desc = 'Debug Toggle Breakpoint' }, + { 'ds', function() require('dap').continue() end, desc = 'Debug Start' }, + { 'dc', function() require('dapui').close() end, desc = 'Debug Close' }, + { 'dn', function() require('dap').step_over() end, desc = 'Debug Step Next' }, + { 'di', function() require('dap').step_into() end, desc = 'Debug Step Into' }, + { 'do', function() require('dap').step_out() end, desc = 'Debug Step Out' }, + -- stylua: ignore end + }, + config = function() + local dap = require 'dap' + local dapui = require 'dapui' + + dapui.setup() -- Set up dapui + + dap.listeners.after.event_initialized['dapui_config'] = function() + dapui.open() + end + + dap.listeners.before.event_terminated['dapui_config'] = function() + dapui.close() + end + + dap.listeners.before.event_exited['dapui_config'] = function() + dapui.close() + end + end, + }, + { + 'mfussenegger/nvim-dap-python', + ft = 'python', + dependencies = { + 'mfussenegger/nvim-dap', + }, + config = function() + local path = '~/.local/share/nvim/mason/packages/debugpy/venv/bin/python' + require('dap-python').setup(path) + end, + }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lint.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lint.lua new file mode 100644 index 0000000..d879ab9 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lint.lua @@ -0,0 +1,27 @@ +-- ================================================================================================ +-- TITLE : nvim lint +-- ABOUT : For code linting +-- LINKS : nvim-lint.nvim https://github.com/mfussenegger/nvim-lint +-- ================================================================================================ + +return { + 'mfussenegger/nvim-lint', + config = function() + require('lint').linters_by_ft = { + javascript = { 'eslint_d' }, + typescript = { 'eslint_d' }, + lua = { 'luacheck' }, + c = { 'cpplint' }, + cpp = { 'cpplint' }, + rust = { 'clippy' }, + python = { 'ruff' }, + } + + -- Lint on save + vim.api.nvim_create_autocmd({ 'BufWritePost' }, { + callback = function() + require('lint').try_lint() + end, + }) + end, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lspconfig.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lspconfig.lua new file mode 100644 index 0000000..d1e6d5a --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lspconfig.lua @@ -0,0 +1,38 @@ +-- ================================================================================================ +-- TITLE : nvim-lspconfig +-- ABOUT : Quickstart configurations for the built-in Neovim LSP client. +-- LINKS : +-- > github : https://github.com/neovim/nvim-lspconfig +-- > mason.nvim (dep) : https://github.com/mason-org/mason.nvim +-- > blink.cmp (dep) : https://github.com/saghen/blink.cmp +-- ================================================================================================ + +return { + 'neovim/nvim-lspconfig', + event = { 'BufReadPre', 'BufNewFile' }, + dependencies = { + -- LSP/DAP/Linter installer & manager + { + 'mason-org/mason.nvim', + opts = { + PATH = 'prepend', + ui = { + icons = { + package_pending = ' ', + package_installed = ' ', + package_uninstalled = ' ', + }, + }, + max_concurrent_installers = 10, + }, + config = function(_, opts) + require('mason').setup(opts) + end, + }, + 'saghen/blink.cmp', -- Allows extra capabilities provided by blink.cmp + }, + config = function() + require('utils.diagnostics').setup() + require 'servers' + end, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-treesitter.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-treesitter.lua new file mode 100644 index 0000000..6690b8d --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-treesitter.lua @@ -0,0 +1,110 @@ +-- ================================================================================================ +-- TITLE : nvim-treesitter +-- ABOUT : Treesitter configurations and abstraction layer for Neovim. +-- LINKS : +-- > nvim-treesitter : https://github.com/nvim-treesitter/nvim-treesitter +-- > github : https://github.com/nvim-treesitter/nvim-treesitter-textobjects (deps) +-- ================================================================================================ + +return { + 'nvim-treesitter/nvim-treesitter', + branch = 'master', + event = { 'BufReadPost', 'BufNewFile' }, + build = ':TSUpdate', + dependencies = { + 'nvim-treesitter/nvim-treesitter-textobjects', + }, + config = function() + require('nvim-treesitter.configs') + .setup --[[@as any]] { + -- Add languages to be installed here that you want installed for treesitter + ensure_installed = { + 'c', + 'cpp', + 'rust', + 'lua', + 'python', + 'javascript', + 'typescript', + 'vimdoc', + 'vim', + 'regex', + 'sql', + 'dockerfile', + 'toml', + 'json', + 'go', + 'gitignore', + 'yaml', + 'make', + 'cmake', + 'markdown', + 'markdown_inline', + 'bash', + 'fish', + 'tsx', + 'css', + 'html', + }, + + -- Autoinstall languages that are not installed + auto_install = false, + + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = '', + node_incremental = '', + scope_incremental = '', + node_decremental = '', + }, + }, + textobjects = { + select = { + enable = true, + lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim + keymaps = { + -- You can use the capture groups defined in textobjects.scm + ['aa'] = '@parameter.outer', + ['ia'] = '@parameter.inner', + ['af'] = '@function.outer', + ['if'] = '@function.inner', + ['ac'] = '@class.outer', + ['ic'] = '@class.inner', + }, + }, + move = { + enable = true, + set_jumps = true, -- whether to set jumps in the jumplist + goto_next_start = { + [']m'] = '@function.outer', + [']]'] = '@class.outer', + }, + goto_next_end = { + [']M'] = '@function.outer', + [']['] = '@class.outer', + }, + goto_previous_start = { + ['[m'] = '@function.outer', + ['[['] = '@class.outer', + }, + goto_previous_end = { + ['[M'] = '@function.outer', + ['[]'] = '@class.outer', + }, + }, + swap = { + enable = true, + swap_next = { + ['a'] = '@parameter.inner', + }, + swap_previous = { + ['A'] = '@parameter.inner', + }, + }, + }, + } + end, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/persistance.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/persistance.lua new file mode 100644 index 0000000..061f71a --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/persistance.lua @@ -0,0 +1,19 @@ +-- ================================================================================================ +-- TITLE : persistence.nvim +-- ABOUT : Session manager for neovim +-- LINKS : +-- > github: https://github.com/folke/persistence.nvim +-- ================================================================================================ + +return { + 'folke/persistence.nvim', + event = 'BufReadPre', + opts = {}, + -- stylua: ignore + keys = { + { "qs", function() require("persistence").load() end, desc = "Restore Session" }, + { "qS", function() require("persistence").select() end,desc = "Select Session" }, + { "ql", function() require("persistence").load({ last = true }) end, desc = "Restore Last Session" }, + { "qd", function() require("persistence").stop() end, desc = "Don't Save Current Session" }, + }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/snacks.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/snacks.lua new file mode 100644 index 0000000..5c552f1 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/snacks.lua @@ -0,0 +1,196 @@ +-- ================================================================================================ +-- TITLE : snacks.nvim +-- ABOUT : QoL plugins for nvim +-- LINKS : +-- > github: https://github.com/folke/snacks.nvim +-- ================================================================================================ +return { + 'folke/snacks.nvim', + priority = 1000, + lazy = false, + ---@type snacks.Config + opts = { + bigfile = { enabled = true }, + dashboard = { + enabled = true, + preset = { + header = [[ +███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ +████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ +██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ +██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ +██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ +╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝]], + }, + sections = { + { section = 'header' }, + { section = 'keys', gap = 1, padding = 1 }, + { section = 'startup', icon = '🚀 ' }, + }, + }, + explorer = { enabled = true }, + indent = { enabled = true }, + image = { enabled = true }, + input = { enabled = true }, + notifier = { + enabled = true, + timeout = 3000, + }, + picker = { + enabled = true, + files = { + cmd = { 'rg', '--files', '--hidden', '--glob', '!.git/*' }, + }, + }, + quickfile = { enabled = true }, + scope = { enabled = true }, + scroll = { enabled = true }, + statuscolumn = { enabled = true }, + words = { enabled = true }, + styles = { + notification = { + wo = { wrap = true }, -- Wrap notifications + }, + }, + }, + -- stylua: ignore start + keys = { + -- Top Pickers & Explorer + { "", function() Snacks.picker.smart() end, desc = "Smart Find Files" }, + { ",", function() Snacks.picker.buffers() end, desc = "Buffers" }, + { "/", function() Snacks.picker.grep() end, desc = "Grep" }, + { ":", function() Snacks.picker.command_history() end, desc = "Command History" }, + { "n", function() Snacks.picker.notifications() end, desc = "Notification History" }, + { "e", function() Snacks.explorer() end, desc = "File Explorer" }, + -- find + { "fb", function() Snacks.picker.buffers() end, desc = "Buffers" }, + { "fc", function() Snacks.picker.files({ cwd = vim.fn.stdpath("config") }) end, desc = "Find Config File" }, + { "ff", function() Snacks.picker.files() end, desc = "Find Files" }, + { "fg", function() Snacks.picker.git_files() end, desc = "Find Git Files" }, + { "fp", function() Snacks.picker.projects() end, desc = "Projects" }, + { "fr", function() Snacks.picker.recent() end, desc = "Recent" }, + -- git + { "gb", function() Snacks.picker.git_branches() end, desc = "Git Branches" }, + { "gl", function() Snacks.picker.git_log() end, desc = "Git Log" }, + { "gL", function() Snacks.picker.git_log_line() end, desc = "Git Log Line" }, + { "gs", function() Snacks.picker.git_status() end, desc = "Git Status" }, + { "gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" }, + { "gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (Hunks)" }, + { "gf", function() Snacks.picker.git_log_file() end, desc = "Git Log File" }, + -- gh + { "gi", function() Snacks.picker.gh_issue() end, desc = "GitHub Issues (open)" }, + { "gI", function() Snacks.picker.gh_issue({ state = "all" }) end, desc = "GitHub Issues (all)" }, + { "gp", function() Snacks.picker.gh_pr() end, desc = "GitHub Pull Requests (open)" }, + { "gP", function() Snacks.picker.gh_pr({ state = "all" }) end, desc = "GitHub Pull Requests (all)" }, + -- Grep + { "sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" }, + { "sB", function() Snacks.picker.grep_buffers() end, desc = "Grep Open Buffers" }, + { "sg", function() Snacks.picker.grep() end, desc = "Grep" }, + { "sw", function() Snacks.picker.grep_word() end, desc = "Visual selection or word", mode = { "n", "x" } }, + -- search + { 's"', function() Snacks.picker.registers() end, desc = "Registers" }, + { 's/', function() Snacks.picker.search_history() end, desc = "Search History" }, + { "sa", function() Snacks.picker.autocmds() end, desc = "Autocmds" }, + { "sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" }, + { "sc", function() Snacks.picker.command_history() end, desc = "Command History" }, + { "sC", function() Snacks.picker.commands() end, desc = "Commands" }, + { "sd", function() Snacks.picker.diagnostics() end, desc = "Diagnostics" }, + { "sD", function() Snacks.picker.diagnostics_buffer() end, desc = "Buffer Diagnostics" }, + { "sh", function() Snacks.picker.help() end, desc = "Help Pages" }, + { "sH", function() Snacks.picker.highlights() end, desc = "Highlights" }, + { "si", function() Snacks.picker.icons() end, desc = "Icons" }, + { "sj", function() Snacks.picker.jumps() end, desc = "Jumps" }, + { "sk", function() Snacks.picker.keymaps() end, desc = "Keymaps" }, + { "sl", function() Snacks.picker.loclist() end, desc = "Location List" }, + { "sm", function() Snacks.picker.marks() end, desc = "Marks" }, + { "sM", function() Snacks.picker.man() end, desc = "Man Pages" }, + { "sp", function() Snacks.picker.lazy() end, desc = "Search for Plugin Spec" }, + { "sq", function() Snacks.picker.qflist() end, desc = "Quickfix List" }, + { "sR", function() Snacks.picker.resume() end, desc = "Resume" }, + { "su", function() Snacks.picker.undo() end, desc = "Undo History" }, + { "uC", function() Snacks.picker.colorschemes() end, desc = "Colorschemes" }, + -- LSP + { "gd", function() Snacks.picker.lsp_definitions() end, desc = "Goto Definition" }, + { "gD", function() Snacks.picker.lsp_declarations() end, desc = "Goto Declaration" }, + { "gr", function() Snacks.picker.lsp_references() end, nowait = true, desc = "References" }, + { "gI", function() Snacks.picker.lsp_implementations() end, desc = "Goto Implementation" }, + { "gy", function() Snacks.picker.lsp_type_definitions() end, desc = "Goto T[y]pe Definition" }, + { "gai", function() Snacks.picker.lsp_incoming_calls() end, desc = "C[a]lls Incoming" }, + { "gao", function() Snacks.picker.lsp_outgoing_calls() end, desc = "C[a]lls Outgoing" }, + { "ss", function() Snacks.picker.lsp_symbols() end, desc = "LSP Symbols" }, + { "sS", function() Snacks.picker.lsp_workspace_symbols() end, desc = "LSP Workspace Symbols" }, + -- Other + { "ps", function() Snacks.profiler.scratch() end, desc = "Profiler Scratch Bufer" }, + { "z", function() Snacks.zen() end, desc = "Toggle Zen Mode" }, + { "Z", function() Snacks.zen.zoom() end, desc = "Toggle Zoom" }, + { ".", function() Snacks.scratch() end, desc = "Toggle Scratch Buffer" }, + { "S", function() Snacks.scratch.select() end, desc = "Select Scratch Buffer" }, + { "n", function() Snacks.notifier.show_history() end, desc = "Notification History" }, + { "bd", function() Snacks.bufdelete() end, desc = "Delete Buffer" }, + { "cR", function() Snacks.rename.rename_file() end, desc = "Rename File" }, + { "gB", function() Snacks.gitbrowse() end, desc = "Git Browse", mode = { "n", "v" } }, + { "gg", function() Snacks.lazygit() end, desc = "Lazygit" }, + { "un", function() Snacks.notifier.hide() end, desc = "Dismiss All Notifications" }, + { "", function() Snacks.terminal() end, desc = "Toggle Terminal" }, + { "", function() Snacks.terminal() end, desc = "which_key_ignore" }, + { "]]", function() Snacks.words.jump(vim.v.count1) end, desc = "Next Reference", mode = { "n", "t" } }, + { "[[", function() Snacks.words.jump(-vim.v.count1) end, desc = "Prev Reference", mode = { "n", "t" } }, + { + "N", + desc = "Neovim News", + function() + Snacks.win({ + file = vim.api.nvim_get_runtime_file("doc/news.txt", false)[1], + width = 0.6, + height = 0.6, + wo = { + spell = false, + wrap = false, + signcolumn = "yes", + statuscolumn = " ", + conceallevel = 3, + }, + }) + end, + } + }, + -- stylua: ignore end + init = function() + vim.api.nvim_create_autocmd('User', { + pattern = 'VeryLazy', + callback = function() + -- Setup some globals for debugging (lazy-loaded) + _G.dd = function(...) + Snacks.debug.inspect(...) + end + _G.bt = function() + Snacks.debug.backtrace() + end + + -- Override print to use snacks for `:=` command + if vim.fn.has 'nvim-0.11' == 1 then + vim._print = function(_, ...) + dd(...) + end + else + vim.print = _G.dd + end + + -- Create some toggle mappings + Snacks.toggle.profiler():map 'pp' + Snacks.toggle.profiler_highlights():map 'ph' + Snacks.toggle.option('spell', { name = 'Spelling' }):map 'us' + Snacks.toggle.option('wrap', { name = 'Wrap' }):map 'uw' + Snacks.toggle.option('relativenumber', { name = 'Relative Number' }):map 'uL' + Snacks.toggle.diagnostics():map 'ud' + Snacks.toggle.line_number():map 'ul' + Snacks.toggle.option('conceallevel', { off = 0, on = vim.o.conceallevel > 0 and vim.o.conceallevel or 2 }):map 'uc' + Snacks.toggle.treesitter():map 'uT' + Snacks.toggle.option('background', { off = 'light', on = 'dark', name = 'Dark Background' }):map 'ub' + Snacks.toggle.inlay_hints():map 'uh' + Snacks.toggle.indent():map 'ug' + Snacks.toggle.dim():map 'uD' + end, + }) + end, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/todo-comments.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/todo-comments.lua new file mode 100644 index 0000000..e19dfd0 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/todo-comments.lua @@ -0,0 +1,21 @@ +-- ================================================================================================ +-- TITLE : todo-comments.nvim +-- LINKS : +-- > github : https://github.com/lewis6991/gitsigns.nvim +-- ABOUT : To highlight and search for todo comments like TODO, HACK, BUG in your code base. +-- ================================================================================================ +return { + 'folke/todo-comments.nvim', + cmd = { 'TodoTrouble', 'TodoTelescope' }, + event = { 'BufReadPre', 'BufNewFile' }, + opts = {}, + -- stylua: ignore + keys = { + { "]t", function() require("todo-comments").jump_next() end, desc = "Next Todo Comment" }, + { "[t", function() require("todo-comments").jump_prev() end, desc = "Previous Todo Comment" }, + { "xt", "Trouble todo toggle", desc = "Todo (Trouble)" }, + { "xT", "Trouble todo toggle filter = {tag = {TODO,FIX,FIXME}}", desc = "Todo/Fix/Fixme (Trouble)" }, + { "st", "TodoTelescope", desc = "Todo" }, + { "sT", "TodoTelescope keywords=TODO,FIX,FIXME", desc = "Todo/Fix/Fixme" }, + }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/which-key.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/which-key.lua new file mode 100644 index 0000000..71d5931 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/plugins/which-key.lua @@ -0,0 +1,23 @@ +-- ================================================================================================ +-- TITLE : which-key +-- ABOUT : WhichKey helps you remember your Neovim keymaps, by showing keybindings as you type. +-- LINKS : +-- > github : https://github.com/folke/which-key.nvim +-- ================================================================================================ + +return { + 'folke/which-key.nvim', + event = 'VeryLazy', + opts = { + preset = 'helix', + }, + keys = { + { + '?', + function() + require('which-key').show { global = false } + end, + desc = 'Buffer Local Keymaps (which-key)', + }, + }, +} diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/bashls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/bashls.lua new file mode 100644 index 0000000..2cc6f12 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/bashls.lua @@ -0,0 +1,14 @@ +-- ================================================================================================ +-- TITLE : bashls (Bash Language Server) LSP Setup +-- LINKS : +-- > github: https://github.com/bash-lsp/bash-language-server +-- ================================================================================================ + +--- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) +--- @return nil +return function(capabilities) + vim.lsp.config('bashls', { + capabilities = capabilities, + filetypes = { 'sh', 'bash', 'zsh' }, + }) +end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/clangd.lua b/modules/home/editors/bugsvim-nvim/lua/servers/clangd.lua new file mode 100644 index 0000000..99a6b1b --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/clangd.lua @@ -0,0 +1,18 @@ +-- ================================================================================================ +-- TITLE : clangd (C/C++ Language Server) LSP Setup +-- LINKS : +-- > website: https://clangd.llvm.org/ +-- ================================================================================================ + +--- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) +--- @return nil +return function(capabilities) + vim.lsp.config('clangd', { + capabilities = capabilities, + cmd = { + 'clangd', + '--offset-encoding=utf-16', + }, + filetypes = { 'c', 'cpp' }, + }) +end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/cssls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/cssls.lua new file mode 100644 index 0000000..da0548d --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/cssls.lua @@ -0,0 +1,16 @@ +-- ================================================================================================ +-- TITLE : cssls (CSS Language Server) LSP Setup +-- ABOUT : Language server for CSS stylesheets +-- LINKS : +-- > github: https://github.com/hrsh7th/vscode-langservers-extracted +-- ================================================================================================ + +--- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) +--- @return nil +return function(capabilities) + vim.lsp.config('cssls', { + cmd = { 'css-languageserver', '--stdio' }, + capabilities = capabilities, + filetypes = { 'css', 'scss', 'less' }, + }) +end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/html.lua b/modules/home/editors/bugsvim-nvim/lua/servers/html.lua new file mode 100644 index 0000000..bad7276 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/html.lua @@ -0,0 +1,16 @@ +-- ================================================================================================ +-- TITLE : html (HTML Language Server) LSP Setup +-- ABOUT : Language server for HTML markup +-- LINKS : +-- > github: https://github.com/hrsh7th/vscode-langservers-extracted +-- ================================================================================================ + +--- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) +--- @return nil +return function(capabilities) + vim.lsp.config('html', { + cmd = { 'html-languageserver', '--stdio' }, + capabilities = capabilities, + filetypes = { 'html', 'templ' }, + }) +end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/hyprls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/hyprls.lua new file mode 100644 index 0000000..5ae0dcf --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/hyprls.lua @@ -0,0 +1,16 @@ +-- ================================================================================================ +-- TITLE : hyprls (Hyprland Language Server) LSP Setup +-- ABOUT : Language server for Hyprland window manager configuration +-- LINKS : +-- > github: https://github.com/hyprwm/hyprland-protocols +-- ================================================================================================ + +--- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) +--- @return nil +return function(capabilities) + vim.lsp.config('hyprls', { + cmd = { 'hyprls' }, + capabilities = capabilities, + filetypes = { 'hyprland' }, + }) +end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/init.lua b/modules/home/editors/bugsvim-nvim/lua/servers/init.lua new file mode 100644 index 0000000..45571aa --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/init.lua @@ -0,0 +1,33 @@ +-- Get default LSP capabilities +local default_capabilities = vim.lsp.protocol.make_client_capabilities() + +-- Merge with blink.cmp capabilities +local capabilities = require('blink.cmp').get_lsp_capabilities(default_capabilities) + +-- Language Server Protocol (LSP) +require 'servers.lua_ls'(capabilities) +require 'servers.pyright'(capabilities) +require 'servers.ts_ls'(capabilities) +require 'servers.tailwindcss'(capabilities) +require 'servers.clangd'(capabilities) +require 'servers.bashls'(capabilities) +require 'servers.rust_analyzer'(capabilities) +require 'servers.html'(capabilities) +require 'servers.cssls'(capabilities) +require 'servers.nil_ls'(capabilities) +require 'servers.hyprls'(capabilities) + +-- Enable lsp servers +vim.lsp.enable { + 'lua_ls', + 'ts_ls', + 'tailwindcss', + 'clangd', + 'bashls', + 'rust_analyzer', + 'pyright', + 'html', + 'cssls', + 'nil_ls', + 'hyprls', +} diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/lua_ls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/lua_ls.lua new file mode 100644 index 0000000..d9cf9d3 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/lua_ls.lua @@ -0,0 +1,27 @@ +-- ================================================================================================ +-- TITLE : lua_ls (Lua Language Server) LSP Setup +-- LINKS : +-- > github: https://github.com/LuaLS/lua-language-server +-- ================================================================================================ + +--- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) +--- @return nil +return function(capabilities) + vim.lsp.config('lua_ls', { + cmd = { 'lua-language-server' }, + capabilities = capabilities, + settings = { + Lua = { + diagnostics = { + globals = { 'vim' }, + }, + workspace = { + library = { + vim.fn.expand '$VIMRUNTIME/lua', + vim.fn.expand '$XDG_CONFIG_HOME' .. '/nvim/lua', + }, + }, + }, + }, + }) +end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/nil_ls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/nil_ls.lua new file mode 100644 index 0000000..85118f0 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/nil_ls.lua @@ -0,0 +1,16 @@ +-- ================================================================================================ +-- TITLE : nil_ls (Nix Language Server) LSP Setup +-- ABOUT : Language server for Nix package manager +-- LINKS : +-- > github: https://github.com/oxalica/nil +-- ================================================================================================ + +--- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) +--- @return nil +return function(capabilities) + vim.lsp.config('nil_ls', { + cmd = { 'nil' }, + capabilities = capabilities, + filetypes = { 'nix' }, + }) +end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/pyright.lua b/modules/home/editors/bugsvim-nvim/lua/servers/pyright.lua new file mode 100644 index 0000000..0a8303a --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/pyright.lua @@ -0,0 +1,24 @@ +-- ================================================================================================ +-- TITLE : pyright (Python Language Server) LSP Setup +-- LINKS : +-- > github: https://github.com/microsoft/pyright +-- ================================================================================================ + +--- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) +--- @return nil This function doesn't return a value, it configures the LSP server +return function(capabilities) + vim.lsp.config('pyright', { + capabilities = capabilities, + settings = { + pyright = { + disableOrganizeImports = false, + analysis = { + useLibraryCodeForTypes = true, + autoSearchPaths = true, + diagnosticMode = 'workspace', + autoImportCompletions = true, + }, + }, + }, + }) +end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/rust_analyzer.lua b/modules/home/editors/bugsvim-nvim/lua/servers/rust_analyzer.lua new file mode 100644 index 0000000..cef83c5 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/rust_analyzer.lua @@ -0,0 +1,21 @@ +-- ================================================================================================ +-- TITLE : rust_analyzer LSP Setup +-- LINKS : +-- > github: https://github.com/rust-analyzer/rust-analyzer +-- ================================================================================================ + +--- @param capabilities table LSP client capabilities (typically from bink-cmp or similar) +--- @return nil +return function(capabilities) + vim.lsp.config('rust_analyzer', { + cmd = { 'rust-analyzer' }, + filetypes = { 'rust' }, + root_markers = { 'Cargo.toml', 'rust-project.json', '.git' }, + capabilities = capabilities, + settings = { + ['rust-analyzer'] = { + cargo = { allFeatures = true }, + }, + }, + }) +end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/tailwindcss.lua b/modules/home/editors/bugsvim-nvim/lua/servers/tailwindcss.lua new file mode 100644 index 0000000..735c630 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/tailwindcss.lua @@ -0,0 +1,21 @@ +-- ================================================================================================ +-- TITLE : tailwindcss LSP Setup +-- LINKS : +-- > github: https://github.com/tailwindlabs/tailwindcss-intellisense +-- ================================================================================================ + +--- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) +--- @return nil +return function(capabilities) + vim.lsp.config('tailwindcss', { + capabilities = capabilities, + filetypes = { + 'javascript', + 'javascriptreact', + 'typescript', + 'typescriptreact', + 'vue', + 'svelte', + }, + }) +end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/ts_ls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/ts_ls.lua new file mode 100644 index 0000000..c9ca67d --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/servers/ts_ls.lua @@ -0,0 +1,47 @@ +-- ================================================================================================ +-- TITLE : ts_ls (TypeScript Language Server) LSP Setup +-- LINKS : +-- > github: https://github.com/typescript-language-server/typescript-language-server +-- ================================================================================================ + +--- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) +--- @return nil +return function(capabilities) + vim.lsp.config('ts_ls', { + capabilities = capabilities, + filetypes = { + 'typescript', + 'javascript', + 'typescriptreact', + 'javascriptreact', + }, + settings = { + typescript = { + indentStyle = 'space', + indentSize = 2, + inlayHints = { + includeInlayParameterNameHints = 'literal', + includeInlayParameterNameHintsWhenArgumentMatchesName = false, + includeInlayFunctionParameterTypeHints = true, + includeInlayVariableTypeHints = false, + includeInlayPropertyDeclarationTypeHints = true, + includeInlayFunctionLikeReturnTypeHints = true, + includeInlayEnumMemberValueHints = true, + }, + }, + javascript = { + indentStyle = 'space', + indentSize = 2, + inlayHints = { + includeInlayParameterNameHints = 'all', + includeInlayParameterNameHintsWhenArgumentMatchesName = false, + includeInlayFunctionParameterTypeHints = true, + includeInlayVariableTypeHints = true, + includeInlayPropertyDeclarationTypeHints = true, + includeInlayFunctionLikeReturnTypeHints = true, + includeInlayEnumMemberValueHints = true, + }, + }, + }, + }) +end diff --git a/modules/home/editors/bugsvim-nvim/lua/utils/diagnostics.lua b/modules/home/editors/bugsvim-nvim/lua/utils/diagnostics.lua new file mode 100644 index 0000000..9f5a558 --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/utils/diagnostics.lua @@ -0,0 +1,47 @@ +local M = {} + +local diagnostic_signs = { + Error = " ", + Warn = " ", + Hint = "", + Info = "", +} + +M.setup = function() + vim.diagnostic.config({ + -- Show signs in the gutter + signs = { + text = { + [vim.diagnostic.severity.ERROR] = diagnostic_signs.Error, + [vim.diagnostic.severity.WARN] = diagnostic_signs.Warn, + [vim.diagnostic.severity.INFO] = diagnostic_signs.Info, + [vim.diagnostic.severity.HINT] = diagnostic_signs.Hint, + }, + numhl = { + [vim.diagnostic.severity.ERROR] = "DiagnosticSignError", + [vim.diagnostic.severity.WARN] = "DiagnosticSignWarn", + [vim.diagnostic.severity.INFO] = "DiagnosticSignInfo", + [vim.diagnostic.severity.HINT] = "DiagnosticSignHint", + }, + linehl = false, + }, + -- Show virtual text next to error (inline diagnostics) + virtual_text = { + prefix = '●', + spacing = 2, + severity = { + min = vim.diagnostic.severity.HINT, -- Show all severity levels + }, + }, + -- Underline errors + underline = true, + -- Show diagnostic in floating window on hover + float = { + source = "always", + }, + severity_sort = true, + update_in_insert = false, + }) +end + +return M diff --git a/modules/home/editors/bugsvim-nvim/lua/utils/lsp.lua b/modules/home/editors/bugsvim-nvim/lua/utils/lsp.lua new file mode 100644 index 0000000..576856d --- /dev/null +++ b/modules/home/editors/bugsvim-nvim/lua/utils/lsp.lua @@ -0,0 +1,44 @@ +local M = {} + +M.on_attach = function(event) + local client = vim.lsp.get_client_by_id(event.data.client_id) + if not client then + return + end + + local bufnr = event.buf + local keymap = vim.keymap.set + local function opts(desc) + return { noremap = true, silent = true, buffer = bufnr, desc = '[LSP]:' .. desc } + end + + -- stylua: ignore start + -- Native LSP Keymaps + keymap("n", "gd", vim.lsp.buf.definition, opts("Go to definition")) + keymap("n", "gS", function() vim.cmd("vsplit") vim.lsp.buf.definition() end, opts("Go to definition (split)")) + keymap("n", "gD", vim.lsp.buf.declaration, opts("Go to declaration")) + keymap("n", "ca", vim.lsp.buf.code_action, opts("Code action")) + keymap("n", "rn", vim.lsp.buf.rename, opts("Rename symbol")) + keymap("n", "D", vim.diagnostic.open_float, opts("Open diagnostics float")) + keymap("n", "cd", function() vim.diagnostic.open_float(nil, { scope = "cursor" }) end, opts("Cursor diagnostics")) + keymap("n", "[d", function () vim.diagnostic.jump({count = -1}) end, opts("Previous diagnostic")) + keymap("n", "]d", function () vim.diagnostic.jump({count = 1}) end, opts("Next diagnostic")) + keymap("n", "K", vim.lsp.buf.hover, opts("Hover documentation")) + -- stylua: ignore end + + -- Organize Imports (if supported) + if client:supports_method('textDocument/codeAction', bufnr) then + keymap('n', 'oi', function() + vim.lsp.buf.code_action { + context = { only = { 'source.organizeImports' }, diagnostics = {} }, + apply = true, + bufnr = bufnr, + } + vim.defer_fn(function() + vim.lsp.buf.format { bufnr = bufnr } + end, 50) + end, opts 'Organize imports') + end +end + +return M diff --git a/modules/home/editors/bugsvim.nix b/modules/home/editors/bugsvim.nix new file mode 100644 index 0000000..b3384a1 --- /dev/null +++ b/modules/home/editors/bugsvim.nix @@ -0,0 +1,76 @@ +{ + config, + pkgs, + lib, + ... +}: let + # Local bugsvim config directory bundled in this repo + bugsvimSrc = ./bugsvim-nvim; +in { + # Disable HM's Neovim module so it doesn't generate ~/.config/nvim/* + programs.neovim = lib.mkForce { + enable = false; + }; + + # Install Neovim + required tools so lazy.nvim can manage plugins/config + home.packages = with pkgs; [ + neovim + + # Language Servers + lua-language-server + pyright + nodePackages.typescript-language-server + tailwindcss-language-server + clang-tools + nodePackages.bash-language-server + rust-analyzer + nodePackages.vscode-langservers-extracted # html, css, json, eslint + nil # Nix LSP + hyprls + + # Formatters + stylua + ruff + prettierd + shfmt + alejandra + + # Linters + nodePackages.eslint_d + luajitPackages.luacheck + cpplint + + # Additional tools + ripgrep + fd + tree-sitter + git + gnumake + ]; + + # Ensure writable config and clear HM symlink remnants during transitions + home.activation.bugsvimSetup = lib.hm.dag.entryAfter ["writeBoundary"] '' + set -eu + UNDO_DIR="$HOME/.local/share/nvim/undodir" + if [ ! -d "$UNDO_DIR" ]; then + $DRY_RUN_CMD mkdir -p "$UNDO_DIR" + echo "Created NeoVim undo directory at $UNDO_DIR" + fi + + # Remove HM symlink remnants from nixvim/nvf (if present) + if [ -L "$HOME/.local/share/nvim/lua" ]; then + $DRY_RUN_CMD rm -rf "$HOME/.local/share/nvim/lua" + fi + + # Copy bugsvim config into ~/.config/nvim (writable) so lazy.nvim can manage updates + SRC=${bugsvimSrc} + DEST="$HOME/.config/nvim" + $DRY_RUN_CMD rm -rf "$DEST" + $DRY_RUN_CMD mkdir -p "$DEST" + $DRY_RUN_CMD cp -r "$SRC"/. "$DEST"/ + $DRY_RUN_CMD chmod -R u+rwX "$DEST" + + # Lazy.nvim will self-bootstrap on first nvim run + # The init.lua handles automatic cloning if lazy.nvim is not present + ''; +} diff --git a/modules/options.nix b/modules/options.nix index d54579a..59d67fb 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -84,6 +84,11 @@ with lib; { default = false; description = "Enable Doom Emacs."; }; + neovimConfig = mkOption { + type = types.enum ["nixvim" "nvf" "bugsvim"]; + default = "nixvim"; + description = "Select Neovim configuration (nixvim, nvf, or bugsvim)."; + }; obsStudioEnable = mkOption { type = types.bool; default = true; From bac5511b8bc832a9d011a3f6af272664983774cf Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 02:25:40 -0400 Subject: [PATCH 159/232] Updated flake add gcc/clang build error --- flake.lock | 79 +++++++++++++++++++++++--------- modules/home/editors/bugsvim.nix | 2 + 2 files changed, 59 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 70af22f..75b00a6 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1773127477, - "narHash": "sha256-ySK+g4eGkaZg4KM116bKWQ9Guq6EihLkOZiSNnPJF5U=", + "lastModified": 1773225300, + "narHash": "sha256-+3HofR35IJ2qETWVCSOqBVE7AEn3f0VVsN2kw4LdRTk=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "2386c4ae3d41c438135b50d23009c5b73ce55ff5", + "rev": "371f4cb914d8dc5646e95ef3413f95bfc97495ef", "type": "github" }, "original": { @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1773179137, - "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=", + "lastModified": 1773608492, + "narHash": "sha256-QZteyExJYSQzgxqdsesDPbQgjctGG7iKV/6ooyQPITk=", "owner": "nix-community", "repo": "home-manager", - "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09", + "rev": "9a40ec3b78fc688d0908485887d355caa5666d18", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", + "lastModified": 1773520392, + "narHash": "sha256-Ra3l8zI7AYwaCxXcU4An8jAC1hhz/TEleXboJhWaBwY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "rev": "f59e980846fe86cd831899cd032fdbd1d6054086", "type": "github" }, "original": { @@ -348,6 +348,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -380,11 +396,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773196620, - "narHash": "sha256-2+oZquEDg+5YLxXmEF3R0Kz40gJNLast6JLRgXFGzjs=", + "lastModified": 1773628930, + "narHash": "sha256-30B1aEHVLdrsiGZOj8X2riKhb7i6p92+DTTNNdWMJsg=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "13f0b8fce4588bd17c99b53d9cba6d73defed0c2", + "rev": "1b2ec2e4a289bf71dc48b95d3c2ba04a8b50a717", "type": "github" }, "original": { @@ -399,14 +415,15 @@ "noctalia", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_2", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773175685, - "narHash": "sha256-YOkWzVq7opym1ovJvSCvqpG6OCDGJwPo/EPeRxcGay4=", + "lastModified": 1773514555, + "narHash": "sha256-XNmLf4HqUM6/he/eJiHT+Mvxmt7QuwgGU14jB4Ha+pM=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "6b9eceefde3d47ca83c544b54bcdd358be4cbd2f", + "rev": "8aa9d8ce86ef018fb442c585ad7fbb2a15a4f822", "type": "github" }, "original": { @@ -454,11 +471,11 @@ ] }, "locked": { - "lastModified": 1773176554, - "narHash": "sha256-i7lgK73pvk5ClHgfVEeIiHFM1S2kjeCF2uvODf2oKlE=", + "lastModified": 1773579076, + "narHash": "sha256-GRuK5zh0Z68YXIoTpHQW2CFdpZRhGJRxpYh4vPOqjt4=", "owner": "notashelf", "repo": "nvf", - "rev": "d057f50cc4ce26d5f8a43cd8ea16a0ac7805b228", + "rev": "baf207654ca613173e9d4b5255dba52f8c0c5577", "type": "github" }, "original": { @@ -644,6 +661,24 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -652,11 +687,11 @@ ] }, "locked": { - "lastModified": 1772858378, - "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=", + "lastModified": 1773225617, + "narHash": "sha256-IT0n3jJgf4M7U0EuZJ2XJwXBmSJVVK3auqWDGeHGMzY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9", + "rev": "413a22ab7acf848ed4e20c3f47ea96ccd4788518", "type": "github" }, "original": { diff --git a/modules/home/editors/bugsvim.nix b/modules/home/editors/bugsvim.nix index b3384a1..8808ca1 100644 --- a/modules/home/editors/bugsvim.nix +++ b/modules/home/editors/bugsvim.nix @@ -27,6 +27,8 @@ in { nodePackages.vscode-langservers-extracted # html, css, json, eslint nil # Nix LSP hyprls + clang + gcc # Formatters stylua From 20c08c50d6db64956a3fc40673e83572d70b38b9 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 02:28:44 -0400 Subject: [PATCH 160/232] Switch to unwrapped gcc/clang for bugsvim --- modules/home/editors/bugsvim.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/home/editors/bugsvim.nix b/modules/home/editors/bugsvim.nix index 8808ca1..a39652d 100644 --- a/modules/home/editors/bugsvim.nix +++ b/modules/home/editors/bugsvim.nix @@ -27,8 +27,8 @@ in { nodePackages.vscode-langservers-extracted # html, css, json, eslint nil # Nix LSP hyprls - clang - gcc + llvmPackages.clang.unwrapped + gcc-unwrapped # Formatters stylua @@ -48,6 +48,10 @@ in { tree-sitter git gnumake + + # Compilers (use unwrapped to avoid /bin/cc collisions) + gcc-unwrapped + llvmPackages.clang-unwrapped ]; # Ensure writable config and clear HM symlink remnants during transitions From ad0fd3b202e6c1362fa18d229dcc0bfbd0430865 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 02:31:18 -0400 Subject: [PATCH 161/232] bad package name --- modules/home/editors/bugsvim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/editors/bugsvim.nix b/modules/home/editors/bugsvim.nix index a39652d..282c532 100644 --- a/modules/home/editors/bugsvim.nix +++ b/modules/home/editors/bugsvim.nix @@ -27,7 +27,7 @@ in { nodePackages.vscode-langservers-extracted # html, css, json, eslint nil # Nix LSP hyprls - llvmPackages.clang.unwrapped + llvmPackages.clang-unwrapped gcc-unwrapped # Formatters From 886146aa2815b9f2720b03095f6f2e134bf6128a Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 02:35:15 -0400 Subject: [PATCH 162/232] Removed unwrapped clang --- modules/home/editors/bugsvim.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/home/editors/bugsvim.nix b/modules/home/editors/bugsvim.nix index 282c532..f47ec00 100644 --- a/modules/home/editors/bugsvim.nix +++ b/modules/home/editors/bugsvim.nix @@ -49,9 +49,8 @@ in { git gnumake - # Compilers (use unwrapped to avoid /bin/cc collisions) + # Compiler (avoid /bin/cc collisions) gcc-unwrapped - llvmPackages.clang-unwrapped ]; # Ensure writable config and clear HM symlink remnants during transitions From dc0ebda41567df1501135e4650c2a55b3a693fd5 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 02:38:41 -0400 Subject: [PATCH 163/232] fixing build errors with bugsvim --- modules/home/editors/bugsvim.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/home/editors/bugsvim.nix b/modules/home/editors/bugsvim.nix index f47ec00..241a6ff 100644 --- a/modules/home/editors/bugsvim.nix +++ b/modules/home/editors/bugsvim.nix @@ -27,7 +27,6 @@ in { nodePackages.vscode-langservers-extracted # html, css, json, eslint nil # Nix LSP hyprls - llvmPackages.clang-unwrapped gcc-unwrapped # Formatters @@ -49,8 +48,6 @@ in { git gnumake - # Compiler (avoid /bin/cc collisions) - gcc-unwrapped ]; # Ensure writable config and clear HM symlink remnants during transitions From 1adff2c5432e2e02503c4d423e61232383697366 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 02:46:12 -0400 Subject: [PATCH 164/232] Switching to stdenv.cc --- modules/home/editors/bugsvim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/editors/bugsvim.nix b/modules/home/editors/bugsvim.nix index 241a6ff..dda25b1 100644 --- a/modules/home/editors/bugsvim.nix +++ b/modules/home/editors/bugsvim.nix @@ -27,7 +27,7 @@ in { nodePackages.vscode-langservers-extracted # html, css, json, eslint nil # Nix LSP hyprls - gcc-unwrapped + stdenv.cc # Formatters stylua From cf0027b5805a0324aa198eb1e594d4194fde85db Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 03:01:29 -0400 Subject: [PATCH 165/232] Switching to waybar on VM --- hosts/zaneyos-next/variables.nix | 51 ++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/hosts/zaneyos-next/variables.nix b/hosts/zaneyos-next/variables.nix index 002dad3..82047c1 100644 --- a/hosts/zaneyos-next/variables.nix +++ b/hosts/zaneyos-next/variables.nix @@ -41,7 +41,7 @@ _: { # Bar/Shell Settings # Choose between noctalia or waybar - barChoice = "noctalia"; + barChoice = "waybar"; # Waybar Settings (used when barChoice = "waybar") clock24h = false; @@ -51,7 +51,7 @@ _: { # This does NOT install your browser # You need to install it by adding it to the `packages.nix` # or as a flatpak - browser = "brave"; + browser = "google-chrome-stable"; # Default applications for this host (written to ~/.config/mimeapps.list) # Uncomment and adjust to set per-host defaults. @@ -76,7 +76,7 @@ _: { # 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-bg"; # Set Default System Terminal + terminal = "kitty"; # Set Default System Terminal keyboardLayout = "us"; keyboardVariant = ""; @@ -88,13 +88,54 @@ _: { # 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-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-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"; }; } From c5cc844fd6c67c127969f1ac8dbe8f56e4974b8e Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 03:57:58 -0400 Subject: [PATCH 166/232] Hardening qs-wallpaper, qs-wlogout --- modules/home/scripts/qs-vid-wallpapers-apply.nix | 2 +- modules/home/scripts/qs-vid-wallpapers.nix | 2 ++ modules/home/scripts/qs-wallpapers-apply.nix | 6 +++--- modules/home/scripts/qs-wallpapers-restore.nix | 6 +++--- modules/home/scripts/qs-wallpapers.nix | 2 ++ modules/home/scripts/qs-wlogout.nix | 2 ++ 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/modules/home/scripts/qs-vid-wallpapers-apply.nix b/modules/home/scripts/qs-vid-wallpapers-apply.nix index b4197d2..c3f7dd8 100644 --- a/modules/home/scripts/qs-vid-wallpapers-apply.nix +++ b/modules/home/scripts/qs-vid-wallpapers-apply.nix @@ -88,7 +88,7 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" '' -o "$opts" \ '*' "$sel" >/dev/null 2>&1 & fi - disown + disown || true log "mpvpaper launched" exit 0 ;; diff --git a/modules/home/scripts/qs-vid-wallpapers.nix b/modules/home/scripts/qs-vid-wallpapers.nix index 36113b0..a3d5e4a 100644 --- a/modules/home/scripts/qs-vid-wallpapers.nix +++ b/modules/home/scripts/qs-vid-wallpapers.nix @@ -509,6 +509,8 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers" '' # Prepare QML runtime environment (Qt6) export QT_QPA_PLATFORM="wayland;xcb" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" + export QT_LOGGING_TO_CONSOLE="1" + export QT_FORCE_STDERR_LOGGING="1" export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins" export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml" export QML2_IMPORT_PATH="$QML_IMPORT_PATH" diff --git a/modules/home/scripts/qs-wallpapers-apply.nix b/modules/home/scripts/qs-wallpapers-apply.nix index 702d8f0..1f9d77c 100644 --- a/modules/home/scripts/qs-wallpapers-apply.nix +++ b/modules/home/scripts/qs-wallpapers-apply.nix @@ -115,7 +115,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' -o "$MPV_OPTS" \ '*' "$sel" >/dev/null 2>&1 & fi - disown + disown || true log "mpvpaper launched" exit 0 ;; @@ -125,7 +125,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' # Start swww-daemon if needed (newer swww has no 'init' subcommand) if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then log "Starting swww-daemon" - ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown + ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true # wait briefly for the daemon to be ready for i in $(${pkgs.coreutils}/bin/seq 1 50); do if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then @@ -177,7 +177,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' else ${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & fi - disown + disown || true exit 0 ;; diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix index fdece87..9f0052f 100644 --- a/modules/home/scripts/qs-wallpapers-restore.nix +++ b/modules/home/scripts/qs-wallpapers-restore.nix @@ -58,7 +58,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then log "Starting swww-daemon" - ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown + ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true for i in $(${pkgs.coreutils}/bin/seq 1 50); do if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then break; fi ${pkgs.coreutils}/bin/sleep 0.1 @@ -90,7 +90,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' echo "wallpaper = $mon,$PATH_J" >> "$_CFG" done log "Starting hyprpaper" - ${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & disown + ${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & disown || true } start_mpvpaper() { @@ -98,7 +98,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true local MPV_OPTS="--no-audio --loop-file=inf --image-display-duration=inf --no-osc --no-osd-bar --keep-open=yes --keepaspect=yes --panscan=1.0" log "Starting mpvpaper" - ${pkgs.mpvpaper}/bin/mpvpaper -o "$MPV_OPTS" '*' "$PATH_J" >/dev/null 2>&1 & disown + ${pkgs.mpvpaper}/bin/mpvpaper -o "$MPV_OPTS" '*' "$PATH_J" >/dev/null 2>&1 & disown || true } start_waypaper() { diff --git a/modules/home/scripts/qs-wallpapers.nix b/modules/home/scripts/qs-wallpapers.nix index 2a25f51..ce03e7b 100644 --- a/modules/home/scripts/qs-wallpapers.nix +++ b/modules/home/scripts/qs-wallpapers.nix @@ -361,6 +361,8 @@ pkgs.writeShellScriptBin "qs-wallpapers" '' # Prepare QML runtime environment (Qt6) export QT_QPA_PLATFORM="wayland;xcb" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" + export QT_LOGGING_TO_CONSOLE="1" + export QT_FORCE_STDERR_LOGGING="1" export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins" export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml" export QML2_IMPORT_PATH="$QML_IMPORT_PATH" diff --git a/modules/home/scripts/qs-wlogout.nix b/modules/home/scripts/qs-wlogout.nix index a21e4a3..4c24cac 100644 --- a/modules/home/scripts/qs-wlogout.nix +++ b/modules/home/scripts/qs-wlogout.nix @@ -232,6 +232,8 @@ in # Setup Qt6 environment with proper app identification export QT_QPA_PLATFORM="wayland;xcb" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" + export QT_LOGGING_TO_CONSOLE="1" + export QT_FORCE_STDERR_LOGGING="1" export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins" export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml" export QML2_IMPORT_PATH="$QML_IMPORT_PATH" From 872fb5556cf79b08dfa162c33e020b963510c269 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 04:12:44 -0400 Subject: [PATCH 167/232] Updated CHANGELOG and version --- CHANGELOG.md | 9 ++++++++- modules/core/system.nix | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76f1ef1..fe21201 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,14 @@ --- -# 🚀 **Current Release - ZaneyOS v2.5.6** +# 🚀 **Current Release - ZaneyOS v2.6.1** + +#### 📅 **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** diff --git a/modules/core/system.nix b/modules/core/system.nix index a2a98c2..6e0a054 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -32,7 +32,7 @@ in { }; environment.variables = { NIXOS_OZONE_WL = "1"; - ZANEYOS_VERSION = "2.5.NG"; + ZANEYOS_VERSION = "2.6.Next"; ZANEYOS = "true"; }; console.keyMap = "${consoleKeyMap}"; From d3880758b27483fc2b2545c8b6ddc0fcc583179d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 04:17:28 -0400 Subject: [PATCH 168/232] Fixed qs-wallpaper qs-logout didn't work from rofi or binding --- CHANGELOG.md | 9 ++++++++- modules/core/system.nix | 2 +- modules/home/scripts/qs-vid-wallpapers-apply.nix | 2 +- modules/home/scripts/qs-vid-wallpapers.nix | 2 ++ modules/home/scripts/qs-wallpapers-apply.nix | 6 +++--- modules/home/scripts/qs-wallpapers-restore.nix | 6 +++--- modules/home/scripts/qs-wallpapers.nix | 2 ++ modules/home/scripts/qs-wlogout.nix | 2 ++ 8 files changed, 22 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61a2b90..8e6fb06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,14 @@ --- -# 🚀 **Current Release - ZaneyOS v2.6.0** +# 🚀 **Current Release - ZaneyOS v2.6.1** + +#### 📅 **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: February 19th, 2026** diff --git a/modules/core/system.nix b/modules/core/system.nix index 850198b..d728615 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -29,7 +29,7 @@ in { }; environment.variables = { NIXOS_OZONE_WL = "1"; - ZANEYOS_VERSION = "2.6.0"; + ZANEYOS_VERSION = "2.6.1"; ZANEYOS = "true"; }; console.keyMap = "${consoleKeyMap}"; diff --git a/modules/home/scripts/qs-vid-wallpapers-apply.nix b/modules/home/scripts/qs-vid-wallpapers-apply.nix index b4197d2..c3f7dd8 100644 --- a/modules/home/scripts/qs-vid-wallpapers-apply.nix +++ b/modules/home/scripts/qs-vid-wallpapers-apply.nix @@ -88,7 +88,7 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" '' -o "$opts" \ '*' "$sel" >/dev/null 2>&1 & fi - disown + disown || true log "mpvpaper launched" exit 0 ;; diff --git a/modules/home/scripts/qs-vid-wallpapers.nix b/modules/home/scripts/qs-vid-wallpapers.nix index 36113b0..a3d5e4a 100644 --- a/modules/home/scripts/qs-vid-wallpapers.nix +++ b/modules/home/scripts/qs-vid-wallpapers.nix @@ -509,6 +509,8 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers" '' # Prepare QML runtime environment (Qt6) export QT_QPA_PLATFORM="wayland;xcb" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" + export QT_LOGGING_TO_CONSOLE="1" + export QT_FORCE_STDERR_LOGGING="1" export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins" export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml" export QML2_IMPORT_PATH="$QML_IMPORT_PATH" diff --git a/modules/home/scripts/qs-wallpapers-apply.nix b/modules/home/scripts/qs-wallpapers-apply.nix index 702d8f0..1f9d77c 100644 --- a/modules/home/scripts/qs-wallpapers-apply.nix +++ b/modules/home/scripts/qs-wallpapers-apply.nix @@ -115,7 +115,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' -o "$MPV_OPTS" \ '*' "$sel" >/dev/null 2>&1 & fi - disown + disown || true log "mpvpaper launched" exit 0 ;; @@ -125,7 +125,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' # Start swww-daemon if needed (newer swww has no 'init' subcommand) if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then log "Starting swww-daemon" - ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown + ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true # wait briefly for the daemon to be ready for i in $(${pkgs.coreutils}/bin/seq 1 50); do if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then @@ -177,7 +177,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' else ${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & fi - disown + disown || true exit 0 ;; diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix index fdece87..9f0052f 100644 --- a/modules/home/scripts/qs-wallpapers-restore.nix +++ b/modules/home/scripts/qs-wallpapers-restore.nix @@ -58,7 +58,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then log "Starting swww-daemon" - ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown + ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true for i in $(${pkgs.coreutils}/bin/seq 1 50); do if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then break; fi ${pkgs.coreutils}/bin/sleep 0.1 @@ -90,7 +90,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' echo "wallpaper = $mon,$PATH_J" >> "$_CFG" done log "Starting hyprpaper" - ${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & disown + ${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & disown || true } start_mpvpaper() { @@ -98,7 +98,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true local MPV_OPTS="--no-audio --loop-file=inf --image-display-duration=inf --no-osc --no-osd-bar --keep-open=yes --keepaspect=yes --panscan=1.0" log "Starting mpvpaper" - ${pkgs.mpvpaper}/bin/mpvpaper -o "$MPV_OPTS" '*' "$PATH_J" >/dev/null 2>&1 & disown + ${pkgs.mpvpaper}/bin/mpvpaper -o "$MPV_OPTS" '*' "$PATH_J" >/dev/null 2>&1 & disown || true } start_waypaper() { diff --git a/modules/home/scripts/qs-wallpapers.nix b/modules/home/scripts/qs-wallpapers.nix index 2a25f51..ce03e7b 100644 --- a/modules/home/scripts/qs-wallpapers.nix +++ b/modules/home/scripts/qs-wallpapers.nix @@ -361,6 +361,8 @@ pkgs.writeShellScriptBin "qs-wallpapers" '' # Prepare QML runtime environment (Qt6) export QT_QPA_PLATFORM="wayland;xcb" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" + export QT_LOGGING_TO_CONSOLE="1" + export QT_FORCE_STDERR_LOGGING="1" export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins" export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml" export QML2_IMPORT_PATH="$QML_IMPORT_PATH" diff --git a/modules/home/scripts/qs-wlogout.nix b/modules/home/scripts/qs-wlogout.nix index a21e4a3..4c24cac 100644 --- a/modules/home/scripts/qs-wlogout.nix +++ b/modules/home/scripts/qs-wlogout.nix @@ -232,6 +232,8 @@ in # Setup Qt6 environment with proper app identification export QT_QPA_PLATFORM="wayland;xcb" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" + export QT_LOGGING_TO_CONSOLE="1" + export QT_FORCE_STDERR_LOGGING="1" export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins" export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml" export QML2_IMPORT_PATH="$QML_IMPORT_PATH" From d09b4bc4c047e18281eba2f920d70b8316fa85f9 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 19 Mar 2026 04:18:42 -0400 Subject: [PATCH 169/232] Updated flake --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 75b00a6..c487805 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1773225300, - "narHash": "sha256-+3HofR35IJ2qETWVCSOqBVE7AEn3f0VVsN2kw4LdRTk=", + "lastModified": 1773854383, + "narHash": "sha256-ra8jcAG9WHDsGvqgumqK7Bq6DQqOrbYm18S+TMKaots=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "371f4cb914d8dc5646e95ef3413f95bfc97495ef", + "rev": "54f7caf3dff6ae6131669e91203fb06f2f82db3a", "type": "github" }, "original": { @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1773608492, - "narHash": "sha256-QZteyExJYSQzgxqdsesDPbQgjctGG7iKV/6ooyQPITk=", + "lastModified": 1773898372, + "narHash": "sha256-PqeDgmyI/Df3/Mv0B81FP/ZC4KuO88YRQF5ZfeFyA4k=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a40ec3b78fc688d0908485887d355caa5666d18", + "rev": "ecf019baf47df009937b5f8c4604cee10f410a76", "type": "github" }, "original": { @@ -266,11 +266,11 @@ ] }, "locked": { - "lastModified": 1772330611, - "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773520392, - "narHash": "sha256-Ra3l8zI7AYwaCxXcU4An8jAC1hhz/TEleXboJhWaBwY=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f59e980846fe86cd831899cd032fdbd1d6054086", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -396,11 +396,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773628930, - "narHash": "sha256-30B1aEHVLdrsiGZOj8X2riKhb7i6p92+DTTNNdWMJsg=", + "lastModified": 1773907741, + "narHash": "sha256-VCOseUhojMawFh/O0ZlSftbiEql4kJn0+WjPqorvk9o=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "1b2ec2e4a289bf71dc48b95d3c2ba04a8b50a717", + "rev": "5eb8b9cbcbf7f9ffcff8b75233bad6e80c721f4c", "type": "github" }, "original": { @@ -419,11 +419,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773514555, - "narHash": "sha256-XNmLf4HqUM6/he/eJiHT+Mvxmt7QuwgGU14jB4Ha+pM=", + "lastModified": 1773842483, + "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "8aa9d8ce86ef018fb442c585ad7fbb2a15a4f822", + "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", "type": "github" }, "original": { @@ -471,11 +471,11 @@ ] }, "locked": { - "lastModified": 1773579076, - "narHash": "sha256-GRuK5zh0Z68YXIoTpHQW2CFdpZRhGJRxpYh4vPOqjt4=", + "lastModified": 1773863905, + "narHash": "sha256-gfTSlftHbUmW3Z++XzquqH/GaAAI/z+Ep/zU03gLMQ4=", "owner": "notashelf", "repo": "nvf", - "rev": "baf207654ca613173e9d4b5255dba52f8c0c5577", + "rev": "046afc8b3e7a5b0f668ef2dc1b8b904e5b892435", "type": "github" }, "original": { @@ -521,11 +521,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1772296853, - "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", + "lastModified": 1773792048, + "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", "owner": "danth", "repo": "stylix", - "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", + "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", "type": "github" }, "original": { @@ -687,11 +687,11 @@ ] }, "locked": { - "lastModified": 1773225617, - "narHash": "sha256-IT0n3jJgf4M7U0EuZJ2XJwXBmSJVVK3auqWDGeHGMzY=", + "lastModified": 1773661718, + "narHash": "sha256-MYm1EKp/gbBi9wMEf7Lx0agIVnej/P61sg97EruWzrU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "413a22ab7acf848ed4e20c3f47ea96ccd4788518", + "rev": "3ac6ea223b32ff63c45e3577712df991a35aaf33", "type": "github" }, "original": { From f5bee5d1d62496aee8b2e02856ba219507c1ad9a Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 20 Mar 2026 20:55:50 -0400 Subject: [PATCH 170/232] Updated flake --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c487805..71b2bd7 100644 --- a/flake.lock +++ b/flake.lock @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1773898372, - "narHash": "sha256-PqeDgmyI/Df3/Mv0B81FP/ZC4KuO88YRQF5ZfeFyA4k=", + "lastModified": 1774007980, + "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", "owner": "nix-community", "repo": "home-manager", - "rev": "ecf019baf47df009937b5f8c4604cee10f410a76", + "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", "type": "github" }, "original": { @@ -396,11 +396,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773907741, - "narHash": "sha256-VCOseUhojMawFh/O0ZlSftbiEql4kJn0+WjPqorvk9o=", + "lastModified": 1774053689, + "narHash": "sha256-8tuH2SJvPi4bjMcXUK5WQYJKql+Aw6V5f3D4UiIP9LI=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "5eb8b9cbcbf7f9ffcff8b75233bad6e80c721f4c", + "rev": "9285188981c3a6f44c0de45eff881d053a312e75", "type": "github" }, "original": { @@ -471,11 +471,11 @@ ] }, "locked": { - "lastModified": 1773863905, - "narHash": "sha256-gfTSlftHbUmW3Z++XzquqH/GaAAI/z+Ep/zU03gLMQ4=", + "lastModified": 1773970322, + "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=", "owner": "notashelf", "repo": "nvf", - "rev": "046afc8b3e7a5b0f668ef2dc1b8b904e5b892435", + "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec", "type": "github" }, "original": { From a7753d4945dfda19abac9fcdb9cc3d2a3842237a Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 20 Mar 2026 21:30:20 -0400 Subject: [PATCH 171/232] Updated flake main branch --- flake.lock | 125 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 88 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 02d75d2..ddcbf05 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1772177232, - "narHash": "sha256-wVhLe9vJEoOf0mx+Z9CrynLm360oqXKMUVt+F6FGIlk=", + "lastModified": 1773854383, + "narHash": "sha256-ra8jcAG9WHDsGvqgumqK7Bq6DQqOrbYm18S+TMKaots=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "df7c7f6471154ec826aed1aefd8cd94e9002ad26", + "rev": "54f7caf3dff6ae6131669e91203fb06f2f82db3a", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1772380125, - "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", + "lastModified": 1773963144, + "narHash": "sha256-WzBOBfSay3GYilUfKaUa1Mbf8/jtuAiJIedx7fWuIX4=", "owner": "nix-community", "repo": "home-manager", - "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", + "rev": "a91b3ea73a765614d90360580b689c48102d1d33", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1771756436, - "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772427700, - "narHash": "sha256-0z+PYDRPM40TLlUmDEro0S66JH/wnMehZM/L+QDX69c=", + "lastModified": 1774052792, + "narHash": "sha256-u+vmvWyYhd1Z1QybtNW7LdqiQVr+sTGibW7AkaAW2G8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "21d7e2d1c731f4e8fff93613ee63972fda4eb0c5", + "rev": "b6202066f0c0f15bf24ac554b1460b83cd7f0802", "type": "github" }, "original": { @@ -472,11 +472,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -487,6 +487,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1771008912, "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", @@ -502,7 +518,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1767799921, "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", @@ -550,11 +566,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772434878, - "narHash": "sha256-nJtHZ6uwOaztMYKejn/tLfK1MnEXh5zgniZsmaOygr8=", + "lastModified": 1774053689, + "narHash": "sha256-8tuH2SJvPi4bjMcXUK5WQYJKql+Aw6V5f3D4UiIP9LI=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "2a692ba942dade06e74cf15426e4af26a90c03fe", + "rev": "9285188981c3a6f44c0de45eff881d053a312e75", "type": "github" }, "original": { @@ -568,14 +584,16 @@ "nixpkgs": [ "noctalia", "nixpkgs" - ] + ], + "systems": "systems_4", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1772227064, - "narHash": "sha256-f821ZSoGpa/aXrWq0gPpea9qBnX8KDyavGKkptz2Mog=", + "lastModified": 1773842483, + "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "0741d27d2f7db567270f139c5d1684614ecf9863", + "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", "type": "github" }, "original": { @@ -638,15 +656,15 @@ "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_2", - "systems": "systems_4" + "nixpkgs": "nixpkgs_3", + "systems": "systems_5" }, "locked": { - "lastModified": 1772219256, - "narHash": "sha256-8RH/xcZOEDf2fJ5h/PSXKxmTnsIMV4AXBj3F8ZdJgyw=", + "lastModified": 1773970322, + "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=", "owner": "notashelf", "repo": "nvf", - "rev": "c07410f1838ce6a44708c49b8ed6fb061babc5ac", + "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec", "type": "github" }, "original": { @@ -697,9 +715,9 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_5", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -707,11 +725,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1771788390, - "narHash": "sha256-RzBpBwn93GWxLjacTte+ngwwg0L/BVOg4G/sSIeK3Rw=", + "lastModified": 1773790548, + "narHash": "sha256-6lI+ZM1yWL4cNRT39s8AUC+kwq237PZCrWc1ubLOwqc=", "owner": "danth", "repo": "stylix", - "rev": "ebb238f14d6f930068be4718472da3105fd5d3bf", + "rev": "e8ffdddd42062ebc90178db9d013aa38c20b7b2f", "type": "github" }, "original": { @@ -767,6 +785,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -781,7 +814,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -877,6 +910,24 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -885,11 +936,11 @@ ] }, "locked": { - "lastModified": 1772317412, - "narHash": "sha256-K2nKL/oUEPMGvJrQl6uHEu8BWt/Ss/tGJaA1omBGTUc=", + "lastModified": 1773661718, + "narHash": "sha256-MYm1EKp/gbBi9wMEf7Lx0agIVnej/P61sg97EruWzrU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6678377209685f3987864355bdc3d14288cfc72d", + "rev": "3ac6ea223b32ff63c45e3577712df991a35aaf33", "type": "github" }, "original": { From 33476ce5624cb92cbff51997e76ba3d086edccfe Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 20 Mar 2026 22:13:58 -0400 Subject: [PATCH 172/232] Porting ZOS-NEXT updates back to ZOS --- CHANGELOG.md | 18 +- flake.lock | 275 ++------- flake.nix | 10 +- hosts/default/variables.nix | 22 +- hosts/zaneyos-24-vm/variables.nix | 8 +- modules/core/overlays.nix | 12 - modules/core/packages.nix | 3 +- modules/core/steam.nix | 2 +- modules/core/thunar.nix | 6 +- modules/home/hyprland/binds.nix | 14 +- modules/home/hyprland/default.nix | 1 - modules/home/hyprland/exec-once.nix | 1 + modules/home/hyprland/hyprland.nix | 34 +- modules/home/hyprland/pyprland.nix | 18 - modules/home/hyprland/windowrules.nix | 554 ++++++++++++++---- modules/home/scripts/DropTerminal.nix | 446 ++++++++++++++ modules/home/scripts/default.nix | 14 + .../home/scripts/hyprland-change-layout.nix | 85 +++ modules/home/scripts/hyprland-float-all.nix | 11 + modules/home/swaync.nix | 2 + .../swaync/images/catppuccin-macchiato.png | Bin 0 -> 25926 bytes modules/home/zsh/default.nix | 2 + 22 files changed, 1118 insertions(+), 420 deletions(-) delete mode 100644 modules/home/hyprland/pyprland.nix create mode 100644 modules/home/scripts/DropTerminal.nix create mode 100644 modules/home/scripts/hyprland-change-layout.nix create mode 100644 modules/home/scripts/hyprland-float-all.nix create mode 100644 modules/home/swaync/images/catppuccin-macchiato.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e6fb06..d474662 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,20 @@ # 🚀 **Current Release - ZaneyOS v2.6.1** -#### 📅 **Updated: March 16th, 2026** +- 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 -- 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. +# 🚀 **Current Release - ZaneyOS v2.6.0** #### 📅 **Updated: February 19th, 2026** diff --git a/flake.lock b/flake.lock index ddcbf05..8628ca4 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1773854383, - "narHash": "sha256-ra8jcAG9WHDsGvqgumqK7Bq6DQqOrbYm18S+TMKaots=", + "lastModified": 1772867847, + "narHash": "sha256-nIXWsnURXPqK4bAwYciu0bLzxHGB9UsmhOmQdeLpegk=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "54f7caf3dff6ae6131669e91203fb06f2f82db3a", + "rev": "a610db44f5c24da9cbde3bbd22f1dd4690d9553e", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -246,24 +246,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakeCompat": { "flake": false, "locked": { @@ -322,16 +304,16 @@ ] }, "locked": { - "lastModified": 1773963144, - "narHash": "sha256-WzBOBfSay3GYilUfKaUa1Mbf8/jtuAiJIedx7fWuIX4=", + "lastModified": 1772845525, + "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a91b3ea73a765614d90360580b689c48102d1d33", + "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -344,11 +326,11 @@ ] }, "locked": { - "lastModified": 1773422513, - "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", + "lastModified": 1772330611, + "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", + "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", "type": "github" }, "original": { @@ -357,34 +339,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "mnw": { "locked": { "lastModified": 1770419553, @@ -440,43 +394,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774052792, - "narHash": "sha256-u+vmvWyYhd1Z1QybtNW7LdqiQVr+sTGibW7AkaAW2G8=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6202066f0c0f15bf24ac554b1460b83cd7f0802", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1768649915, - "narHash": "sha256-jc21hKogFnxU7KXSVTRmxC7u5D4RHwm9BAvDf5/Z1Uo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3e3f3c7f9977dc123c23ee21e8085ed63daf8c37", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -487,22 +409,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1771008912, "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", @@ -518,18 +424,18 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1767799921, - "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -540,20 +446,18 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1769049374, - "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", + "lastModified": 1772402258, + "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=", "owner": "nix-community", "repo": "nixvim", - "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", + "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-25.11", "repo": "nixvim", "type": "github" } @@ -566,11 +470,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774053689, - "narHash": "sha256-8tuH2SJvPi4bjMcXUK5WQYJKql+Aw6V5f3D4UiIP9LI=", + "lastModified": 1772925400, + "narHash": "sha256-I0Gb+CO6bXi1U5PYgCqnuvI1B+R9kZtamLwhVvOywSo=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9285188981c3a6f44c0de45eff881d053a312e75", + "rev": "5f319987a5003c383678f4aae0cf71f78c7ea49e", "type": "github" }, "original": { @@ -584,16 +488,14 @@ "nixpkgs": [ "noctalia", "nixpkgs" - ], - "systems": "systems_4", - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1773842483, - "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", + "lastModified": 1772673824, + "narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", + "rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690", "type": "github" }, "original": { @@ -614,11 +516,11 @@ ] }, "locked": { - "lastModified": 1767886815, - "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -627,44 +529,21 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768249818, - "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=", - "owner": "NuschtOS", - "repo": "search", - "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "nvf": { "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_3", - "systems": "systems_5" + "nixpkgs": "nixpkgs_2", + "systems": "systems_3" }, "locked": { - "lastModified": 1773970322, - "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=", + "lastModified": 1772875143, + "narHash": "sha256-ENBRe7vCCp/SIG2WRKI2pyAxwnrc9CPuwZ4CtMu4KU4=", "owner": "notashelf", "repo": "nvf", - "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec", + "rev": "6681e33727409d4ccfa687de981b594110a735d6", "type": "github" }, "original": { @@ -680,8 +559,6 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "noctalia": "noctalia", "nvf": "nvf", @@ -715,9 +592,9 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nur": "nur", - "systems": "systems_6", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -725,16 +602,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1773790548, - "narHash": "sha256-6lI+ZM1yWL4cNRT39s8AUC+kwq237PZCrWc1ubLOwqc=", + "lastModified": 1772296853, + "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", "owner": "danth", "repo": "stylix", - "rev": "e8ffdddd42062ebc90178db9d013aa38c20b7b2f", + "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", "type": "github" }, "original": { "owner": "danth", - "ref": "release-25.11", + "ref": "master", "repo": "stylix", "type": "github" } @@ -785,36 +662,6 @@ } }, "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "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" - } - }, - "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -865,11 +712,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767817087, - "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "bd99656235aab343e3d597bf196df9bc67429507", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -910,24 +757,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -936,11 +765,11 @@ ] }, "locked": { - "lastModified": 1773661718, - "narHash": "sha256-MYm1EKp/gbBi9wMEf7Lx0agIVnej/P61sg97EruWzrU=", + "lastModified": 1772858378, + "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3ac6ea223b32ff63c45e3577712df991a35aaf33", + "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ad7cff5..e3a88f6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,12 @@ inputs = { home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/release-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nvf.url = "github:notashelf/nvf"; - stylix.url = "github:danth/stylix/release-25.11"; + stylix.url = "github:danth/stylix/master"; nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest"; noctalia = { @@ -20,7 +18,7 @@ # Checking nixvim to see if it's better nixvim = { - url = "github:nix-community/nixvim/nixos-25.11"; + url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index aff6cc0..8badf01 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -1,7 +1,7 @@ { # Git Configuration ( For Pulling Software Repos ) - gitUsername = "Tyler Kelley"; - gitEmail = "tylerzanekelley@gmail.com"; + gitUsername = "Don Williams"; + gitEmail = "don.e.williams@gmail.com"; # Set Displau Manager # `tui` for Text login @@ -30,7 +30,7 @@ # 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 @@ -84,8 +84,8 @@ printEnable = false; # Enable Thunar GUI File Manager - # Yazi is default File Manager - thunarEnable = false; + # Yazi is alternate File Manager + thunarEnable = true; # Themes, waybar and animation. # Only uncomment your selection @@ -95,17 +95,17 @@ # This will set your color palette # Default background # Add new images to ~/zaneyos/wallpapers - stylixImage = ../../wallpapers/mountainscapedark.jpg; + #stylixImage = ../../wallpapers/mountainscapedark.jpg; #stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; - #stylixImage = ../../wallpapers/Rainnight.jpg; + 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-curved.nix; #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; #waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix; #waybarChoice = ../../modules/home/waybar/waybar-simple.nix; @@ -124,12 +124,12 @@ #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-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-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; @@ -138,7 +138,7 @@ #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-classic.nix; #animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix; #animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix; diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix index d0a1a7b..05dfff9 100644 --- a/hosts/zaneyos-24-vm/variables.nix +++ b/hosts/zaneyos-24-vm/variables.nix @@ -99,8 +99,8 @@ #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/Rainnight.jpg; + #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg; #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; @@ -131,7 +131,7 @@ # 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.nix; #animChoice = ../../modules/home/hyprland/animations-end4-slide.nix; #animChoice = ../../modules/home/hyprland/animations-end-slide.nix; #animChoice = ../../modules/home/hyprland/animations-dynamic.nix; @@ -139,7 +139,7 @@ #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-classic.nix; #animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix; #animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix; diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index 137cfe6..1f473aa 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -2,18 +2,6 @@ nixpkgs.overlays = [ # Provide pkgs.google-antigravity via antigravity-nix overlay inputs.antigravity-nix.overlays.default - # pkgs.unstable overlay for bleeding edge applications - (_final: prev: { - unstable = import inputs.nixpkgs-unstable { - inherit (prev.stdenv.hostPlatform) system; - config.allowUnfree = true; - }; - }) - # Prefer stable mpv-with-scripts and yt-dlp to avoid deno source builds - (final: _prev: { - mpv-with-scripts = inputs.nixpkgs-stable.legacyPackages.${final.stdenv.hostPlatform.system}.mpv-with-scripts; - yt-dlp = inputs.nixpkgs-stable.legacyPackages.${final.stdenv.hostPlatform.system}.yt-dlp; - }) # Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk (_final: prev: { xfce = prev.xfce // { diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 9bea5c2..3b7d27d 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -30,7 +30,6 @@ in { seahorse.enable = true; fuse.userAllowOther = true; mtr.enable = true; - adb.enable = true; hyprlock.enable = true; gnupg.agent = { enable = true; @@ -75,7 +74,7 @@ in { mdcat # CLI markdown parser mpv # Incredible Video Player ncdu # Disk Usage Analyzer With Ncurses Interface - nixfmt-rfc-style # Nix Formatter + nixfmt # Nix Formatter nwg-displays # configure monitor configs via GUI nwg-drawer # Application launcher for wayland nwg-dock-hyprland # Dock for hyprland diff --git a/modules/core/steam.nix b/modules/core/steam.nix index 6fafcf7..84829ec 100644 --- a/modules/core/steam.nix +++ b/modules/core/steam.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { programs = { steam = { - enable = true; + enable = false; remotePlay.openFirewall = true; dedicatedServer.openFirewall = false; gamescopeSession.enable = true; diff --git a/modules/core/thunar.nix b/modules/core/thunar.nix index c7419e0..9c82ac5 100644 --- a/modules/core/thunar.nix +++ b/modules/core/thunar.nix @@ -8,9 +8,9 @@ in { programs = { thunar = { enable = thunarEnable; - plugins = with pkgs.xfce; [ - thunar-archive-plugin - thunar-volman + plugins = [ + pkgs.thunar-archive-plugin + pkgs.thunar-volman ]; }; }; diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 383b744..5d8491f 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -16,7 +16,7 @@ "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier CTRL,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockscreen lock" "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" @@ -70,16 +70,22 @@ in { "$modifier,O, OBS Studio, exec, obs" "$modifier ALT,C, Color Picker, exec, hyprpicker -a" "$modifier,G, GIMP, exec, gimp" - "$modifier shift,T, Dropdown Terminal, exec, pypr toggle term" + "$modifier SHIFT,T, Dropdown Terminal, exec, sh -lc 'DropTerminal'" "$modifier,T, Thunar, exec, thunar" "$modifier ALT,M, Audio Control, exec, pavucontrol" # ============= WINDOW MANAGEMENT ============= "$modifier,Q, Kill Active Window, killactive," "$modifier,P, Pseudo Tile, pseudo," - "$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit," + "$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit" "$modifier,F, Maximize, fullscreen," "$modifier SHIFT,F, Toggle Floating, togglefloating," - "$modifier ALT,F, Float All Windows, workspaceopt, allfloat" + "$modifier ALT,F, Float All Windows, exec, hyprland-float-all" + # ============= LAYOUTS ============= + "$modifier ALT,L, Toggle Layouts, exec, hyprland-change-layout toggle" + "$modifier ALT,1, Layout Dwindle, exec, hyprland-change-layout dwindle" + "$modifier ALT,2, Layout Master, exec, hyprland-change-layout master" + "$modifier ALT,3, Layout Scrolling, exec, hyprland-change-layout scrolling" + "$modifier ALT,4, Layout Monocle, exec, hyprland-change-layout monocle" "$modifier SHIFT,C, Exit/Logout of Hyprland, exit," # ============= WINDOW MOVEMENT (ARROW KEYS) ============= "$modifier SHIFT,left, Move Left, movewindow, l" diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index ab286ca..0e41181 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -9,7 +9,6 @@ in { ./hypridle.nix ./hyprland.nix ./hyprlock.nix - ./pyprland.nix ./windowrules.nix ]; } diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index adec6b2..130233a 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -38,6 +38,7 @@ in { "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user start hyprpolkitagent" "qs -c overview" # Start quickshell-overview daemon + "hyprland-change-layout init" ] ++ noctaliaExec ++ waybarExec; }; diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 79dab33..367e28a 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -108,9 +108,18 @@ 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 = { - "$modifier" = "SUPER"; layout = "dwindle"; gaps_in = 6; gaps_out = 8; @@ -139,9 +148,15 @@ in { }; dwindle = { - pseudotile = true; + pseudotile = false; preserve_split = true; - force_split = 2; + smart_resizing = true; + use_active_for_splits = true; + smart_split = false; + default_split_ratio = 1.0; + split_bias = 0; + precise_mouse_move = false; + special_scale_factor = 0.8; }; decoration = { @@ -182,9 +197,16 @@ in { }; master = { - new_status = "master"; - new_on_top = 1; - mfact = 0.5; + new_status = "slave"; + new_on_top = false; + new_on_active = "none"; + orientation = "left"; + mfact = 0.55; + slave_count_for_center_master = 2; + center_master_fallback = "left"; + smart_resizing = true; + drop_at_cursor = true; + always_keep_position = false; }; # Ensure Xwayland windows render at integer scale; compositor scales them diff --git a/modules/home/hyprland/pyprland.nix b/modules/home/hyprland/pyprland.nix deleted file mode 100644 index 0bffe11..0000000 --- a/modules/home/hyprland/pyprland.nix +++ /dev/null @@ -1,18 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [pyprland]; - - home.file.".config/hypr/pyprland.toml".text = '' - [pyprland] - plugins = [ - "scratchpads", - ] - - [scratchpads.term] - animation = "fromTop" - command = "kitty --class kitty-dropterm" - class = "kitty-dropterm" - size = "70% 70%" - max_size = "1920px 100%" - position = "150px 150px" - ''; -} diff --git a/modules/home/hyprland/windowrules.nix b/modules/home/hyprland/windowrules.nix index 87cd9aa..be4fc9a 100644 --- a/modules/home/hyprland/windowrules.nix +++ b/modules/home/hyprland/windowrules.nix @@ -1,130 +1,436 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - extraMonitorSettings - ; -in { +_: { wayland.windowManager.hyprland = { - settings = { - windowrule = [ - #"noblur, xwayland:1" # Helps prevent odd borders/shadows for xwayland apps - # downside it can impact other xwayland apps - # This rule is a template for a more targeted approach - "noblur, class:^(\bresolve\b)$, xwayland:1" # Window rule for just resolve - "tag +file-manager, class:^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$" - "tag +terminal, class:^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm)$" - "tag +browser, class:^(Brave-browser(-beta|-dev|-unstable)?)$" - "tag +browser, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$" - "tag +browser, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$" - "tag +browser, class:^([Tt]horium-browser|[Cc]achy-browser)$" - "tag +projects, class:^(codium|codium-url-handler|VSCodium)$" - "tag +projects, class:^(VSCode|code-url-handler)$" - "tag +im, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$" - "tag +im, class:^([Ff]erdium)$" - "tag +im, class:^([Ww]hatsapp-for-linux)$" - "tag +im, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$" - "tag +im, class:^(teams-for-linux)$" - "tag +games, class:^(gamescope)$" - "tag +games, class:^(steam_app_\d+)$" - "tag +gamestore, class:^([Ss]team)$" - "tag +gamestore, title:^([Ll]utris)$" - "tag +gamestore, class:^(com.heroicgameslauncher.hgl)$" - "tag +settings, class:^(gnome-disks|wihotspot(-gui)?)$" - "tag +settings, class:^([Rr]ofi)$" - "tag +settings, class:^(file-roller|org.gnome.FileRoller)$" - "tag +settings, class:^(nm-applet|nm-connection-editor|blueman-manager)$" - "tag +settings, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$" - "tag +settings, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$" - "tag +settings, class:(xdg-desktop-portal-gtk)" - "tag +settings, class:(.blueman-manager-wrapped)" - "tag +settings, class:(nwg-displays)" - "move 72% 7%,title:^(Picture-in-Picture)$" - # qs-keybinds floating viewer - "float, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" - "center, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" - "size 55% 66%, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" - # qs-cheatsheets floating viewer - "float, title:^(Cheatsheets Viewer)$" - "center, title:^(Cheatsheets Viewer)$" - "size 65% 60%, title:^(Cheatsheets Viewer)$" - "center, class:^([Ff]erdium)$" - "float, class:^([Ww]aypaper)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "center, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "center, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "center, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - # qs-keybinds, qs-docs, qs-chevron floating viewer - "float, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" - "center, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" - "size 55% 66%, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" - "center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$" - "center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)" - "center, title:^(Authentication Required)$" - "idleinhibit fullscreen, class:^(*)$" - "idleinhibit fullscreen, title:^(*)$" - "idleinhibit fullscreen, fullscreen:1" - "float, tag:settings*" - "float, class:^([Ff]erdium)$" - "float, title:^(Picture-in-Picture)$" - "float, class:^(mpv|com.github.rafostar.Clapper)$" - "float, title:^(Authentication Required)$" - "float, class:(codium|codium-url-handler|VSCodium), title:negative:(.*codium.*|.*VSCodium.*)" - "float, class:^(com.heroicgameslauncher.hgl)$, title:negative:(Heroic Games Launcher)" - "float, class:^([Ss]team)$, title:negative:^([Ss]team)$" - "float, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)" - "float, initialTitle:(Add Folder to Workspace)" - "float, initialTitle:(Open Files)" - "float, initialTitle:(wants to save)" - "size 70% 60%, initialTitle:(Open Files)" - "size 70% 60%, initialTitle:(Add Folder to Workspace)" - "size 70% 70%, tag:settings*" - "size 60% 70%, class:^([Ff]erdium)$" - "opacity 1.0 1.0, tag:browser*" - "opacity 0.9 0.8, tag:projects*" - "opacity 0.94 0.86, tag:im*" - "opacity 0.9 0.8, tag:file-manager*" - "opacity 0.8 0.7, tag:terminal*" - "opacity 0.8 0.7, tag:settings*" - "opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$" - "opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui" - "opacity 0.95 0.75, title:^(Picture-in-Picture)$" - "pin, title:^(Picture-in-Picture)$" - "keepaspectratio, title:^(Picture-in-Picture)$" - "noblur, tag:games*" - "fullscreen, tag:games*" - ]; - windowrulev2 = [ - # qs-wallpapers styling via compositor - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" + extraConfig = '' + # Set float and centering for dialog boxes + rule = float(true), match:modal:1 + rule = center(true), match:modal:1 - # qs-vid-wallpapers styling via compositor - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" + windowrule { + name = Resolve + match:class = ^(\bresolve\b)$ + match:xwayland = 1 + no_blur = on + } - # qs-wlogout styling via compositor - power menu overlay - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "rounding 20, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "opacity 1.0 1.0, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" + windowrule { + name = Thunar + match:class = ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$ + tag = +file-manager + } - # qs-docs / qs-cheatsheets overlay windows - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" - ]; - }; + windowrule { + name = Terminals + match:class = ^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm|dropterminal)$ + tag = +terminal + } + + windowrule { + name = Brave-browser + match:class = ^(Brave-browser(-beta|-dev|-unstable)?)$ + tag = +browser + } + + windowrule { + name = Firefox + match:class = ^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$ + tag = +browser + } + + windowrule { + name = Google-chrome + match:class = ^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$ + tag = +browser + } + + windowrule { + name = Thorium-browser + match:class = ^([Tt]horium-browser|[Cc]achy-browser)$ + tag = +browser + } + + windowrule { + name = vscodium + match:class = ^(codium|codium-url-handler|VSCodium)$ + tag = +projects + } + + windowrule { + name = vscode + match:class = ^(VSCode|code-url-handler)$ + tag = +projects + } + + windowrule { + name = Discord + match:class = ^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$ + tag = +im + } + + windowrule { + name = Ferdium + match:class = ^([Ff]erdium)$ + center = on + float = on + size = 60% = 70% + tag = +im + } + + windowrule { + name = Whatsapp + match:class = ^([Ww]hatsapp-for-linux)$ + tag = +im + } + + windowrule { + name = Telegram-desktop + match:class = ^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$ + tag = +im + } + + windowrule { + name = teams-for-linux + match:class = ^(teams-for-linux)$ + tag = +im + } + + windowrule { + name = gamescope + match:class = ^(gamescope)$ + tag = +games + } + + windowrule { + name = steam-app + match:class = ^(steam_app\d+)$ + tag = +games + } + + windowrule { + name = Steam + match:class = ^([Ss]team)$ + tag = +gamestore + } + + windowrule { + name = Lutris + match:title = ^([Ll]utris)$ + tag = +gamestore + } + + windowrule { + name = heroicgameslauncher + match:class = ^(com.heroicgameslauncher.hgl)$ + tag = +gamestore + } + + windowrule { + name = gnome-disks + match:class = ^(gnome-disks|wihotspot(-gui)?)$ + tag = +settings + } + + windowrule { + name = rofi + match:class = ^([Rr]ofi)$ + tag = +settings + no_blur = off + } + + windowrule { + name = FileRoller + match:class = ^(file-roller|org.gnome.FileRoller)$ + tag = +settings + } + + windowrule { + name = NetworkManger + match:class = ^(nm-applet|nm-connection-editor|blueman-manager)$ + tag = +settings + } + + windowrule { + name = PlusAudio + match:class = ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$ + center = on + tag = +settings + no_blur = off + } + + windowrule { + name = nwg-look + match:class = ^(nwg-look|qt5ct|qt6ct|[Yy]ad)$ + tag = +settings + } + + windowrule { + name = xdg-desktop-portal-gtk + match:class = (xdg-desktop-portal-gtk) + tag = +settings + } + + windowrule { + name = blueman + match:class = (.blueman-manager-wrapped) + tag = +settings + } + + windowrule { + name = nwg-displays + match:class = (nwg-displays) + tag = +settings + } + + windowrule { + name = Picture-in-Picture + match:title = ^(Picture-in-Picture)$ + float = on + move = 72% = 7% + opacity = 0.95 = 0.75 + pin = 0 + keep_aspect_ratio = on + } + + windowrule { + name = ThunarFileMgr + match:class = ([Tt]hunar) + match:title = negative:(.*[Tt]hunar.*) + center = on + float = on + } + + windowrule { + name = Authentication-Required + match:title = ^(Authentication Required)$ + center = on + float = on + } + + windowrule { + name = IdleInhibit-fullscreen-1 + match:class = ^(*)$ + idle_inhibit = fullscreen + } + + windowrule { + name = IdleInhibit-fullscreen-2 + match:title = ^(*)$ + idle_inhibit = fullscreen + } + + windowrule { + name = IdleInhibit-fullscreen-3 + match:fullscreen = 1 + idle_inhibit = fullscreen + } + + windowrule { + name = Settings-Tag + match:tag = settings* + float = on + opacity = 0.8 = 0.7 + size = 70% = 70% + no_blur = off + } + + windowrule { + name = WayPaper + match:class = ^([Ww]aypaper)$ + float = on + no_blur = off + } + + windowrule { + name = mpv-or-clapper + match:class = ^(mpv|com.github.rafostar.Clapper)$ + float = on + } + + windowrule { + name = codium-url-handler + match:class = (codium|codium-url-handler|VSCodium) + match:title = negative:(.*codium.*|.*VSCodium.*) + float = on + } + + windowrule { + name = heroicgameslauncher-1 + match:class = ^(com.heroicgameslauncher.hgl)$ + match:title = negative:(Heroic Games Launcher) + float = on + } + + windowrule { + name = Steam + match:class = ^([Ss]team)$ + match:title = negative:^([Ss]team)$ + float = on + } + + windowrule { + name = Add-Folder + match:initial_title = (Add Folder to Workspace) + float = on + size = 70% = 60% + } + + windowrule { + name = Open-File + match:initial_title = (Open Files) + float = on + size = 70% = 60% + } + + windowrule { + name = Wants-to-Save + match:initial_title = (wants to save) + float = on + } + + windowrule { + name = Browsers + match:tag = browser* + opacity = 1.0 = 1.0 + } + + windowrule { + name = Projects + match:tag = projects* + opacity = 0.9 = 0.8 + } + + windowrule { + name = Instant-Messaging + match:tag = im* + opacity = 0.94 = 0.86 + } + + windowrule { + name = File-Managers + match:tag = file-manager* + opacity = 0.9 = 0.8 + } + + windowrule { + name = Terminals-opacity + match:tag = terminal* + opacity = 0.8 = 0.7 + no_blur = off + } + + windowrule { + name = windowrule-77 + match:class = ^(gedit|org.gnome.TextEditor|mousepad)$ + opacity = 0.8 = 0.7 + } + + windowrule { + name = windowrule-78 + match:class = ^(seahorse)$ + opacity = 0.9 = 0.8 + } + + windowrule { + name = windowrule-79 + match:tag = games* + no_blur = on + } + + windowrule { + name = windowrule-80 + match:tag = games* + fullscreen = on + } + + windowrule { + name = qs-keybinds + match:title = ^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$ + float = on + center = on + size = 55% = 66% + } + + windowrule { + name = qs-cheatsheets + match:title = ^(Cheatsheets Viewer)$ + float = on + center = on + size = 65% = 60% + } + + windowrule { + name = qs-extended-viewers + match:title = ^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$ + float = on + center = on + size = 55% = 66% + } + + windowrule { + name = QS-Wallpapers + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Wallpapers)$ + border_size = 0 + float = on + no_blur = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QA-Video-Wallpapers + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Video Wallpapers)$ + border_size = 0 + center = on + float = on + no_blur = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QS-wlogout + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(qs-wlogout)$ + border_size = 0 + center = on + float = on + opacity = 1.0 = 1.0 + rounding = 20 + } + + windowrule { + name = QA-Panels + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Panels)$ + center = on + float = on + no_blur = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QS-Cheatsheets + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Cheatsheets Viewer)$ + border_size = 0 + center = on + float = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QS-Documentation-Viewer + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Documentation Viewer)$ + border_size = 0 + center = on + float = on + no_shadow = on + rounding = 12 + } + ''; }; } diff --git a/modules/home/scripts/DropTerminal.nix b/modules/home/scripts/DropTerminal.nix new file mode 100644 index 0000000..cbc14d1 --- /dev/null +++ b/modules/home/scripts/DropTerminal.nix @@ -0,0 +1,446 @@ +{pkgs}: +pkgs.writeShellScriptBin "DropTerminal" '' + #!/usr/bin/env bash + # Dropdown Terminal for Hyprland (Nix-managed) + # Source: adapted from Dropterminal.sh by Kiran George (SherLock707) + # Usage: + # DropTerminal [-d] [] + # Behavior: + # - If is omitted, uses $TERM, with fallback to kitty when $TERM is unset/empty + + set -euo pipefail + + DEBUG=false + # Use a dedicated special workspace so preload never flashes on screen + SPECIAL_WS="special:dropterminal" + ADDR_FILE="/tmp/dropdown_terminal_addr" + SPAWN_ONLY=false # if true, just create hidden in scratchpad and exit + + # Sanitize Hyprland JSON to strict JSON (work around NaN/Inf issues) + hyprjson() { + # Usage: hyprjson + # Emits strict JSON, replacing invalid numeric literals with null + hyprctl "$@" -j 2>/dev/null | sed -E 's/: *nan([,}])/ : null\1/gi; s/: *-nan([,}])/ : null\1/gi; s/: *inf([,}])/ : null\1/gi; s/: *-inf([,}])/ : null\1/gi' + } + + # Dropdown size and position configuration (percentages) + WIDTH_PERCENT=65 # Width as percentage of screen width + HEIGHT_PERCENT=65 # Height as percentage of screen height + Y_PERCENT=10 # Y position as percentage from top (X is auto-centered) + + # Animation settings + ANIMATION_DURATION=100 # milliseconds + SLIDE_STEPS=5 + SLIDE_DELAY=5 # milliseconds between steps + + # Parse arguments + if [ "''${1-}" = "-d" ] || [ "''${1-}" = "--debug" ]; then + DEBUG=true + shift || true + fi + if [ "''${1-}" = "-S" ] || [ "''${1-}" = "--spawn-only" ]; then + SPAWN_ONLY=true + shift || true + fi + # Env override for startup usage + if [ "''${DROPTERM_SPAWN_ONLY-}" = "1" ]; then + SPAWN_ONLY=true + fi + + # Terminal command: prefer explicit arg; otherwise always use kitty + TERMINAL_CMD="''${1-}" + if [ -z "''${TERMINAL_CMD}" ]; then + TERMINAL_CMD="kitty" + fi + + # Debug echo function + debug_echo() { + if [ "$DEBUG" = true ]; then + echo "$@" >&2 + fi + } + + # Wait until Hyprland returns sane JSON (monitors/workspace ready) + wait_for_hypr() { + for i in $(seq 1 60); do + if hyprjson monitors | ${pkgs.jq}/bin/jq -e 'length > 0' >/dev/null 2>&1 \ + && hyprjson activeworkspace | ${pkgs.jq}/bin/jq -e '.id | numbers' >/dev/null 2>&1; then + return 0 + fi + sleep 0.05 + done + return 0 + } + + # Function to get window geometry + get_window_geometry() { + local addr="$1" + hyprjson clients | ${pkgs.jq}/bin/jq -r --arg ADDR "$addr" '.[] | select(.address == $ADDR) | "\(.at[0]) \(.at[1]) \(.size[0]) \(.size[1])"' + } + + # Ensure a window is floating + ensure_floating() { + local addr="$1" + local is_float=$(hyprjson clients | ${pkgs.jq}/bin/jq -r --arg ADDR "$addr" '.[] | select(.address == $ADDR) | .floating // false') + if [ "$is_float" != "true" ]; then + hyprctl dispatch togglefloating "address:$addr" >/dev/null 2>&1 || true + sleep 0.02 + fi + } + + # Function to animate window slide down (show) + animate_slide_down() { + local addr="$1" + local target_x="$2" + local target_y="$3" + local width="$4" + local height="$5" + 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" + + # Start position (above screen) + local start_y=$((target_y - height - 50)) + + # Calculate step size + local step_y=$(((target_y - start_y) / SLIDE_STEPS)) + + # Move window to start position instantly (off-screen) + hyprctl dispatch movewindowpixel "exact $target_x $start_y,address:$addr" >/dev/null 2>&1 + sleep 0.05 + + # Animate slide down + for i in $(seq 1 $SLIDE_STEPS); do + local current_y=$((start_y + (step_y * i))) + hyprctl dispatch movewindowpixel "exact $target_x $current_y,address:$addr" >/dev/null 2>&1 + sleep 0.03 + done + + # Ensure final position is exact + hyprctl dispatch movewindowpixel "exact $target_x $target_y,address:$addr" >/dev/null 2>&1 + } + + # Function to animate window slide up (hide) + animate_slide_up() { + local addr="$1" + local start_x="$2" + local start_y="$3" + local width="$4" + local height="$5" + 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" + + # End position (above screen) + local end_y=$((start_y - height - 50)) + + # Calculate step size + local step_y=$(((start_y - end_y) / SLIDE_STEPS)) + + # Animate slide up + for i in $(seq 1 $SLIDE_STEPS); do + local current_y=$((start_y - (step_y * i))) + hyprctl dispatch movewindowpixel "exact $start_x $current_y,address:$addr" >/dev/null 2>&1 + sleep 0.03 + done + + debug_echo "Slide up animation completed" + } + + # Function to get monitor info including scale and name of focused monitor + get_monitor_info() { + local monitor_data=$(hyprjson monitors | ${pkgs.jq}/bin/jq -r '.[] | select(.focused == true) | "\(.x) \(.y) \(.width) \(.height) \(.scale // 1) \(.name)"') + if [ -z "$monitor_data" ] || [[ "$monitor_data" =~ ^null ]]; then + debug_echo "Error: Could not get focused monitor information" + return 1 + fi + echo "$monitor_data" + } + + # Function to calculate dropdown position with proper scaling and centering + calculate_dropdown_position() { + local monitor_info=$(get_monitor_info) + + if [ $? -ne 0 ] || [ -z "$monitor_info" ]; then + debug_echo "Error: Failed to get monitor info, using fallback values" + echo "100 100 800 600 fallback-monitor" + return 1 + fi + + local mon_x=$(echo $monitor_info | cut -d' ' -f1) + local mon_y=$(echo $monitor_info | cut -d' ' -f2) + local mon_width=$(echo $monitor_info | cut -d' ' -f3) + local mon_height=$(echo $monitor_info | cut -d' ' -f4) + local mon_scale=$(echo $monitor_info | cut -d' ' -f5) + local mon_name=$(echo $monitor_info | cut -d' ' -f6) + # 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" + + # Validate scale value and provide fallback + if [ -z "$mon_scale" ] || [ "$mon_scale" = "null" ] || [ "$mon_scale" = "0" ]; then + debug_echo "Invalid scale value, using 1.0 as fallback" + mon_scale="1.0" + fi + + # Calculate logical dimensions by dividing physical dimensions by scale + local logical_width logical_height + if [ -x "${pkgs.bc}/bin/bc" ]; then + logical_width=$(echo "scale=0; $mon_width / $mon_scale" | ${pkgs.bc}/bin/bc | cut -d'.' -f1) + logical_height=$(echo "scale=0; $mon_height / $mon_scale" | ${pkgs.bc}/bin/bc | cut -d'.' -f1) + else + # Fallback to integer math (multiply by 100 for precision, then divide) + local scale_int=$(echo "$mon_scale" | sed 's/\.///' | sed 's/^0*//') + if [ -z "$scale_int" ]; then scale_int=100; fi + + logical_width=$(((mon_width * 100) / scale_int)) + logical_height=$(((mon_height * 100) / scale_int)) + fi + + # Ensure we have valid integer values + if ! [[ "$logical_width" =~ ^-?[0-9]+$ ]]; then logical_width=$mon_width; fi + if ! [[ "$logical_height" =~ ^-?[0-9]+$ ]]; then logical_height=$mon_height; fi + + debug_echo "Physical resolution: ''${mon_width}x''${mon_height}" + debug_echo "Logical resolution: ''${logical_width}x''${logical_height} (physical ÷ scale)" + + # Calculate window dimensions based on LOGICAL space percentages + local width=$((logical_width * WIDTH_PERCENT / 100)) + local height=$((logical_height * HEIGHT_PERCENT / 100)) + + # Calculate Y position from top based on percentage of LOGICAL height + local y_offset=$((logical_height * Y_PERCENT / 100)) + + # Calculate centered X position in LOGICAL space + local x_offset=$(((logical_width - width) / 2)) + + # Apply monitor offset to get final positions in logical coordinates + local final_x=$((mon_x + x_offset)) + local final_y=$((mon_y + y_offset)) + + debug_echo "Window size: ''${width}x''${height} (logical pixels)" + debug_echo "Final position: x=$final_x, y=$final_y (logical coordinates)" + debug_echo "Hyprland will scale these to physical coordinates automatically" + + echo "$final_x $final_y $width $height $mon_name" + } + + # Ensure Hyprland is ready and get the current workspace + wait_for_hypr + CURRENT_WS=$(hyprjson activeworkspace | ${pkgs.jq}/bin/jq -r '.id // empty') + if [ -z "''${CURRENT_WS}" ]; then + # Try once more after a short wait + sleep 0.1 + CURRENT_WS=$(hyprjson activeworkspace | ${pkgs.jq}/bin/jq -r '.id // empty') + fi + if [ -z "''${CURRENT_WS}" ]; then + debug_echo "Warning: unable to read active workspace; using workspace 1" + CURRENT_WS="1" + fi + + # Function to get stored terminal address + get_terminal_address() { + if [ -f "$ADDR_FILE" ] && [ -s "$ADDR_FILE" ]; then + cut -d' ' -f1 "$ADDR_FILE" + fi + } + + # Function to get stored monitor name + get_terminal_monitor() { + if [ -f "$ADDR_FILE" ] && [ -s "$ADDR_FILE" ]; then + cut -d' ' -f2- "$ADDR_FILE" + fi + } + + # Function to check if terminal exists + terminal_exists() { + local addr=$(get_terminal_address) + if [ -n "$addr" ]; then + hyprjson clients | ${pkgs.jq}/bin/jq -e --arg ADDR "$addr" 'map(select(.address == $ADDR)) | any' >/dev/null 2>&1 + else + return 1 + fi + } + + # Function to check if terminal is in special workspace + terminal_in_special() { + local addr=$(get_terminal_address) + if [ -n "$addr" ]; then + hyprjson clients | ${pkgs.jq}/bin/jq -e --arg ADDR "$addr" --arg WS "$SPECIAL_WS" 'map(select(.address == $ADDR and .workspace.name == $WS)) | any' >/dev/null 2>&1 + else + return 1 + fi + } + + # Function to spawn terminal and capture its address + spawn_terminal() { + debug_echo "Creating new dropdown terminal with command: $TERMINAL_CMD" + + # Calculate dropdown position for later use + local pos_info=$(calculate_dropdown_position) + if [ $? -ne 0 ]; then + debug_echo "Warning: Using fallback positioning" + fi + local target_x 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}" + + # Create a unique title so we can robustly identify the new window + local token=$(date +%s%N) + local title="dropterm-$token" + local spawn_cmd="$TERMINAL_CMD --class dropterminal --instance-group dropterminal --title $title" + + # Launch in scratchpad to avoid visible spawn; size will be enforced after detection + hyprctl dispatch exec "[float; workspace $SPECIAL_WS silent] $spawn_cmd" >/dev/null 2>&1 || true + + # Wait for the new window with our unique class/title (up to ~3s) + local new_addr="" + for i in $(seq 1 60); do + new_addr=$(hyprjson clients | ${pkgs.jq}/bin/jq -r --arg CLS "dropterminal" --arg TITLE "$title" \ + '.[] | select(.class == $CLS and .title == $TITLE) | .address' | head -1) + if [ -n "$new_addr" ]; then break; fi + sleep 0.05 + done + + if [ -n "$new_addr" ] && [ "$new_addr" != "null" ]; then + # Store the address and monitor name + echo "$new_addr $monitor_name" >"$ADDR_FILE" + debug_echo "Terminal created with address: $new_addr in special workspace on monitor $monitor_name" + + # Ensure scratchpad placement (in case exec flags were ignored) + hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$new_addr" >/dev/null 2>&1 || true + ensure_floating "$new_addr" + hyprctl dispatch resizewindowpixel "exact $width $height,address:$new_addr" >/dev/null 2>&1 || true + + if [ "$SPAWN_ONLY" = true ]; then + # Keep it hidden for startup preload + debug_echo "Spawn-only: leaving terminal hidden in scratchpad" + return 0 + fi + + # Bring to current workspace and set up geometry/animation + hyprctl dispatch movetoworkspacesilent "$CURRENT_WS,address:$new_addr" + ensure_floating "$new_addr" + hyprctl dispatch pin "address:$new_addr" + hyprctl dispatch resizewindowpixel "exact $width $height,address:$new_addr" + animate_slide_down "$new_addr" "$target_x" "$target_y" "$width" "$height" + + return 0 + fi + + debug_echo "Failed to detect new kitty window; aborting spawn" + return 1 + } + + # Main logic + if terminal_exists; then + TERMINAL_ADDR=$(get_terminal_address) + debug_echo "Found existing terminal: $TERMINAL_ADDR" + focused_monitor=$(get_monitor_info | awk '{print $6}') + dropdown_monitor=$(get_terminal_monitor) + if [ "$focused_monitor" != "$dropdown_monitor" ]; then + debug_echo "Monitor focus changed: moving dropdown to $focused_monitor" + # Calculate new position for focused monitor + pos_info=$(calculate_dropdown_position) + 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" + # Update ADDR_FILE + echo "$TERMINAL_ADDR $monitor_name" >"$ADDR_FILE" + fi + + if terminal_in_special; then + debug_echo "Bringing terminal from scratchpad with slide down animation" + + # Calculate target position + pos_info=$(calculate_dropdown_position) + 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" + ensure_floating "$TERMINAL_ADDR" + hyprctl dispatch pin "address:$TERMINAL_ADDR" + + # Set size and animate slide down + hyprctl dispatch resizewindowpixel "exact $width $height,address:$TERMINAL_ADDR" + animate_slide_down "$TERMINAL_ADDR" "$target_x" "$target_y" "$width" "$height" + + hyprctl dispatch focuswindow "address:$TERMINAL_ADDR" + else + debug_echo "Hiding terminal to scratchpad with slide up animation" + + # Get current geometry for animation + geometry=$(get_window_geometry "$TERMINAL_ADDR") + if [ -n "$geometry" ]; then + curr_x=$(echo $geometry | cut -d' ' -f1) + curr_y=$(echo $geometry | cut -d' ' -f2) + curr_width=$(echo $geometry | cut -d' ' -f3) + curr_height=$(echo $geometry | cut -d' ' -f4) + + debug_echo "Current geometry: ''${curr_x},''${curr_y} ''${curr_width}x''${curr_height}" + + # Animate slide up first + animate_slide_up "$TERMINAL_ADDR" "$curr_x" "$curr_y" "$curr_width" "$curr_height" + + # Small delay then move to special workspace and unpin + sleep 0.1 + hyprctl dispatch pin "address:$TERMINAL_ADDR" # Unpin (toggle) + hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR" + else + debug_echo "Could not get window geometry, moving to scratchpad without animation" + hyprctl dispatch pin "address:$TERMINAL_ADDR" + hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR" + fi + fi + else + debug_echo "No existing terminal found, creating new one" + if spawn_terminal; then + TERMINAL_ADDR=$(get_terminal_address) + if [ "$SPAWN_ONLY" = false ] && [ -n "$TERMINAL_ADDR" ]; then + hyprctl dispatch focuswindow "address:$TERMINAL_ADDR" + fi + fi + fi +'' diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 94f1355..6e99baa 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -17,6 +17,7 @@ (import ./screenshootin.nix {inherit pkgs;}) (import ./squirtle.nix {inherit pkgs;}) (import ./task-waybar.nix {inherit pkgs;}) + (import ./DropTerminal.nix {inherit pkgs;}) (import ./wallsetter.nix { inherit pkgs; inherit username; @@ -36,6 +37,8 @@ (import ./qs-wlogout.nix {inherit pkgs;}) (import ./qs-docs.nix {inherit pkgs;}) (import ./docs-parser.nix {inherit pkgs;}) + (import ./hyprland-float-all.nix {inherit pkgs;}) + (import ./hyprland-change-layout.nix {inherit pkgs;}) (import ./launch-nwg-menu.nix {inherit pkgs;}) (import ./hyprland-dock.nix {inherit pkgs;}) (import ./restart.noctalia.nix {inherit pkgs;}) @@ -46,4 +49,15 @@ ]; }) ]; + + xdg.desktopEntries.dropterminal = { + name = "Drop Terminal"; + comment = "Dropdown terminal (Hyprland)"; + exec = "DropTerminal"; + terminal = false; + type = "Application"; + icon = "kitty"; + settings.StartupWMClass = "dropterminal"; + categories = ["System" "Utility" "TerminalEmulator"]; + }; } diff --git a/modules/home/scripts/hyprland-change-layout.nix b/modules/home/scripts/hyprland-change-layout.nix new file mode 100644 index 0000000..0ce0e65 --- /dev/null +++ b/modules/home/scripts/hyprland-change-layout.nix @@ -0,0 +1,85 @@ +{pkgs}: +pkgs.writeShellScriptBin "hyprland-change-layout" '' + #!/usr/bin/env bash + set -euo pipefail + + notif="''${XDG_CONFIG_HOME:-$HOME/.config}/swaync/images/catppuccin-macchiato.png" + layouts=(dwindle master scrolling monocle) + + get_layout() { + ${pkgs.hyprland}/bin/hyprctl -j getoption general:layout | ${pkgs.jq}/bin/jq -r '.str' + } + + next_layout() { + local current="$1" + local i + for i in "''${!layouts[@]}"; do + if [[ "''${layouts[i]}" == "$current" ]]; then + echo "''${layouts[((i + 1) % ''${#layouts[@]})]}" + return + fi + done + echo "''${layouts[0]}" + } + + set_layout() { + local target="$1" + + ${pkgs.hyprland}/bin/hyprctl keyword general:layout "$target" + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,J || true + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,K || true + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,O || true + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER_SHIFT,M || true + + case "$target" in + "dwindle") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,O,layoutmsg,togglesplit + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Dwindle Layout" + ;; + "master") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Master Layout" + ;; + "scrolling") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Scrolling Layout" + ;; + "monocle") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER_SHIFT,M,layoutmsg,swapnext + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Monocle Layout" + ;; + *) + echo "Unknown layout: $target" >&2 + return 1 + ;; + esac + } + + current="$(get_layout)" + arg="''${1:-toggle}" + + case "$arg" in + init) + set_layout "$current" + ;; + toggle|next) + set_layout "$(next_layout "$current")" + ;; + set) + set_layout "''${2:-}" + ;; + master|dwindle|scrolling|monocle) + set_layout "$arg" + ;; + *) + echo "Usage: $(basename "$0") [toggle|next|init|set |master|dwindle|scrolling|monocle]" >&2 + exit 1 + ;; + esac +'' diff --git a/modules/home/scripts/hyprland-float-all.nix b/modules/home/scripts/hyprland-float-all.nix new file mode 100644 index 0000000..e99c30f --- /dev/null +++ b/modules/home/scripts/hyprland-float-all.nix @@ -0,0 +1,11 @@ +{pkgs}: +pkgs.writeShellScriptBin "hyprland-float-all" '' + #!/usr/bin/env bash + set -euo pipefail + + ws="$(${pkgs.hyprland}/bin/hyprctl activeworkspace -j | ${pkgs.jq}/bin/jq -r .id)" + ${pkgs.hyprland}/bin/hyprctl clients -j | ${pkgs.jq}/bin/jq -r --arg ws "$ws" '.[] | select(.workspace.id == ($ws|tonumber)) | .address' \ + | while read -r addr; do + [ -n "''${addr:-}" ] && ${pkgs.hyprland}/bin/hyprctl dispatch togglefloating "address:$addr" + done +'' diff --git a/modules/home/swaync.nix b/modules/home/swaync.nix index 07e6261..a29959b 100644 --- a/modules/home/swaync.nix +++ b/modules/home/swaync.nix @@ -1,4 +1,6 @@ {config, ...}: { + home.file."${config.xdg.configHome}/swaync/images/catppuccin-macchiato.png".source = + ./swaync/images/catppuccin-macchiato.png; services.swaync = { enable = true; settings = { diff --git a/modules/home/swaync/images/catppuccin-macchiato.png b/modules/home/swaync/images/catppuccin-macchiato.png new file mode 100644 index 0000000000000000000000000000000000000000..ddb8cd643c21cc31c53d9dd31e976de2e605f313 GIT binary patch literal 25926 zcmeAS@N?(olHy`uVBq!ia0y~yV3-EN0&ENn3^^0mE@WU}P)PO&@?~JCQe$9fXklRZ z#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7}%1$-Ca~v)YYx5Hq~z3#K6G7S>O>_ z%)r310gNYTiyJU7r0nu^aSW-r^>%K0g2>hD?enY6_qI>CAQaW$Ak`vO^?q*$D~s!f z28}YuzyKEOj)oh7flGuHzTB%;Sm^vhQDuTd)!pj*{JXht#4&De`*HvI>6A3};`DcC z=Inf0eopY}Dppq0%tfYVIX5;G&R6dK&60CtL*iq(uo37t1UOY^V40q$hFIFE+UHaSXedvXkuMaxklV;nu^>1=^ z4ZoH9-!*?6D;|2Q9*F+YspX(~Dwy@dLY+`Y6T$l@o)s)PwT{)B|IoHyf%>)cn715R zkj}_>Wr3q%%yPHIj%!0DPjP0=&0HL1$K{*NBWG?P^~Bl8uS)EA*gYxX@-7nD|g4zMVmBub;Lwl#5-6IZK<92LC{Yj%B$I@ z_09ZC=a%o~JZ)EF{`4=)j!Q3(Y`X00V3(Pp?aZjmDiX0#uE;}KwxoXUs?Q4^-ut)w zw;k)(pkHQhXL9b^ZMArEL(Qg>hV%Uu3tB7AF|aA zz1Q-R+>h3DOugNBGDBp+&zpNfe#xjcFK9SFv(GxD()`Kcw9^lkd^~V;>+FZ87Jk;3 zv18k`JSJCyOF~oSfBYW5&52_7xfY*j=w8h4+f~i8>DLky-`=)O3mqe`{%+D+zvznL zg`YhSm@YJ$@G;+%N#Q7H^e%NynE}9PYW58qaMyNBga!Uppj$+gUXGN!7!=Fw-~mg~9GE|*I$VNsiB@mEd6O}u9M zf2j_?qzM(@@9)nsynp4>NuIr7rmCz-MvIfCr91Avb)H}DpPfYCt?gUCGc0@U|MiNJ zrqRD=@tp@=M`ehwu-kic+A-$`CHLRHE>}CeGyU6Y33h=pHuh%b0FSyrsgl}=_19iI z@NLXa66e@jyj#*bo_+n~r;ARnW0qYU6XKd+zux#8U*Gk9l}!i!S*BM%k5^18I)Cl% zb4RCMW#>NMmO1U0WiIt9)QRai6>M(JetdpoZ{lCs=N8BK1dLN74~ueGO5I%O&QNhy z@9)O{EEm>QEzUapKYztP9_F$e&HGl^hg1f9bU1rm`S5}yzY7c8HapJ0kiV)W`uE@0 z8eEzzfuV8}qaXOR-hKOhAIEd`cl_Ne**Eo;Op}aQo4P>#g~wg4Ic~eB7R_c9+-S>R z9?jL4dpB(NR<^(U@)q6}Pi!o+c)(EAXtgrWq4n0n>CMdx+)_S^`bIO`eyN;Wv^wsc z1T)`_=D1ZtA&gUI#}xbZUJ6(pntkid0E!ehN z@z~mcvZAFu6LMC>sU`XDmT!EyXH9gH)anyI*`MlMy8NYJ!~R!4Ru%KL*xq_`dSCW| zoo%!CeiyoMxHPzS?(EpD_0onBHJWzqf82|Oif%dhM1*|!lsDn;wch!cZ#DclcBNG3 z)3nB$4J%x=;!>Ob>p#qOa(DRJp|)6w*afurPn=HSX6nw z@U9%o^G3P+-RaGBuHn~AeM5`4!s`H8?y))zlfF7%C|I> znX&WXI=hAY$1 zYHrqwTYRZiVSnr@Y(n-2Jb$`vZR7bb#k&*(9PD-;4G?^$H~o#Swsg$HPd&+&>ib%R zv&5#eub`O zVEHs}UfSuDuFXu`GSb#bBkr=O@E@o43;>YIOMTjZsUWSi%VGlYcJS)#q4V9?)Oz#|qtufHaAMKRW`RV1#Ew3%3!;P<^Q&DF=7>SBFEHaDDFG_PZW(@*mqK1v_aLhGCJiwAt?a-*BxKht_2 z#>c)lzH((&1LJR{d9#d4=l<^Ce59)pG5@pQyF!f_lZ`dfSv&Z8l3GMxy|-^VoA8%4 zX{yI`TgAU;uZVT_JKSlKjTUEb-dOqY!5^6gd~1&!4%4uhAG4|9Y0cTw0goSd)V+;s zH+rn)x9%xR*7~YrJEkwne|T53Z^r{B9+AsOQ!M6f{rFHfT=C<^$7lUzm@YbpP2g*o z_(w^$Xa7~DS&J7P+&lGt@V@yDZ}slVy}Tp+=Fi)=Z}}VVt*yVx{crwbi4Di)uJ}D& zq1AA|;eh#S7KamGzt!HVW3$oPClK6VBD6E9^_R9YZy@iMcB#d7Ej!r5V`Fx62IWYGUFX|Rt;p51@Q4(=KFya3)=ceM^3m1Py|IISI(pgy$`$s9Jwc*Va>DPHS ze1>-y$@SK8bCo^!Iq%CRCo;e5``Ungsb@B9sdD#i&00HapM0eJpY)dNJa3t+CR!~v z`f=J&eXnQz%KfanEx&PoD_-cg^4B#rZoDr6wm&?RF2`?ynDZ|?Tb{%KCM#8GWo++jos(czNp-d+0MK?FR%K}uRD`$ zEo|Sn-FCU~{^hYiMw;&Ga2^l))xP~KH+EVsqZV99o9@tT%=_td+mOLaYTLlPFB@f-I1GkRalO# z@7dUFe6ZdA<|XDMmVvS7j#TmAQo5Y8^sj4s`rOHiIS!j8YZo81JaqPWwegGe65+XC zA5Y3vb$)#0tC2DPcgDRMiyvWEnqJ(Ua8>DR`|DZ<7tZ>Jxvjr8o{$q;by-XHk36@v z$f^amxPANG``BasYS--F6{`Qs^6hHvrq6o)1^w?87Wu88c=vYm3j6=XN@Zq{ZGc;*}Ly`y~yl?yPREYFNX0jEv`;n z+VuWG!I!=nM|~BFANI~z(y36!Rc$#ZdY!rJQQez|4Ytaj+OqD4=ZDJywoA|L&Xs3b z_ENkgxy%1sLZzbh=}SQer}n8&pPR*VTq z|Fl@$`L*jd@18JWZcXyjUU$W|72Ky~75~qkleg2pSwdr3r~m({)?eozNZasEq;(?G z1jbLMFL|y{i~VP5$JQ5r_xFcWDi`h>`+aAz`6wv5Cg5M?<~NCLUrbdTPMn{}XS=QO zx$-{6e^OhP-&$oAT(gP2UeJr<#ab_I`Hs&~mRY{>9#h4Q^+FjQs+*s5jqv{_u=>=h zfDdnjp9U-~S2(iv@Q!V-9r`Z|ny{^Rerl&wo&J@?fo7>JEDBK&EztO4I z;!&6O1@}GL_nMOJb1n9yvZ!pcdsp^IeS&RjL&=g8vEBb(-{84+_faRmXoG%*@AkIG z$G@4y@01Nn(tF=4uJGsS>Pw8TPs+)B&AQ66r)Qti0yUQHnP1|{^#z!p`2CbpyLtFu z(hBkJH;V3l6CXb~w%~|v_%^3EYhHM*KGkfMKPN4Q^NPq?7jEq-^V>2nR85$nXxIE; z~t!uaj4c_?Fn!eVp8K zRN(uiQ{v(FY*mYXxw$e=b%}iy@qOAK@r{yeb|1a-RCssGVi``!%lSHfRT6ypw*>d^ zV3#;8dhJ|4+p9}qJX@T8irsV;F_vUCJ?6e8-(2KWP0+{o2U-ihiEMszP)AzeKDUe6 z9En{&uje)vR6d-zz5goX&G4|vaw4^-4=Gi11an`NDp(!xOL_j=3!hG^v-7^>+j?qC z<%&>~4LL^|NKS!7q5oB;*Pqrnh*9|c^&Sbeu25PPfX;mO6$?qmGjr=**^SqMfq=^ z*i?_%H7zx|2E5&s1~HqFrEbBHVGt3AdpaJx48T@&ks_p^$% z7OQ`lG($6KZNLWCZwY0htG4V3`|rUj>do4lU%~Rl^Y64>P9IOoozdU$LdV;i_qqGA zKP4};EiTtw-)SrAFl|!ylbAKvFKH-DkGW8KMQE$skI4Qj`bnQEOEx)GDj#9`$o=H+ ztgV*T5`1qus>**lo%rbgTh&(Rh{;4PA%>hyt@WTvH#qO4T-}6Rg@;Rjbg`#9{At~B zEBafLg__n0{xiR$9y`XaS^hfx;JYn{1)g6P_*Ss_{BO6$;^6J4?zKDGFP45S(&hi{ zLYR&Ayf&x*f2RJlEckHjQlj>~hMp_g@0XM?ZHzUWF4*7}xwLN0+U!djA{_3P;dP83 zHmq$8gbi+C-t-52^$cjU!xJIt11pRZig1e-l=~#drMei8v!JqxpO7 ztWF9ak$b2Vf8^Ju_A1f)9Pe1K7Qgn%wPu>JF8xZ4yl>+h_GFO5CC%Epqvb;|n+V?@M~HGA^0y#Wdky=_G@#22b8kdu0Cl(jBIstMBJ;4LI_?ZvWf=OIFLM zOjbw@d-UVSy@EH-_Z|~Hys$3pcVn|TQ*?v|Q-euRiIZU5=gPjQvtGbuwCCX#ZNaSK`R^r2SvmF9!Wn zxy{@;M^$Xc!B9P>%$Tdw8>C|%D-}4$Kb@4hJM-?Qx!EyHn|2%w^=bQHG{KFl(}8W} ztxa{3C1TfiGAZ@2?%`EWd*dJRS2^UTRZ7O?l>t_ZYEHkJ>#$f{G}Hg6QuT)G*&)Fn zcD<06DG+iJb6fWPhiF-NtmFq@p%=$~&6vfuYRe52Ugx9Q&AR3x#b>e0-5 z&czN=yvKR78=R|l#zo%YzdAp`&rI>vNogawb!^A^ZFckUs5ABmTd@0=Pzn*F5eS-_@n6K1raZUSQ6|gPu=*5E*7hHR}PfPH|vgxmX zI`Ev9WPXz{a~@yS>~m?_8@hXa*tc!=sb_q1MSCXaoRrOR%vILzGx>6oH7_^HR?WP} zmXj=L?C^Y3NIhT8vh9}yBwT81Ip5TkXgp8h=SgT;$KA6?w=!%+M@`X5w!eb@F9kS0 zt=+!&aps3D+J9HnO9xEuna#!2AT!rl?8Rc4B;kT7u{x}M8>02u`8H41PzXFOz&+>j zhI@R!ICe)c9ocw&&wsu}4U4O$-(x(oaq`k<|Kqu=dSk0N3qszfSa)1iind`8|Kw-0 zH{D>)tZlOuxy-dnw4}B9 z-svnC{g$2^Pp)2H)nJpAp>7^jW7jxMk^Qtl19RUFk@BUYvWud&E?A)ETXJ&l_6;pY z|DswY;@h}b`uZ~XWW#M{8QAg8xwUiNr!S0ZFWfl~Tq!gzSiM^P?74N1o(0XQpI(2l zbxQr^ttRWaFV{t7o4m-b+Ev7MH?n%w(iw-g?1k$5e&r&YPQ*ANZFB z&bNOrbnl+&zgqEMVeI|0U)NtX{rC3U{WtpGJkmefEV;VdO!Xkc#lQQi|9uU65O}?Q z!*>1>&A(C0r#BzixaqX&^X(4xYi_^JJNmui?h&QvA2&X1d+2HL`P97R-y&;neZ6== zvu}dEin{7@?vC`MNgrR^>%UvK@vxlxh23AZ{_<|E1@;%uzc48Hb!zDaWjU=J-ZhdN z`Ok^U?A`b`I>7BQL$dvXMJqg0HeN}d7*LeX$t$seeeROwTGcB;c3pdTj9cMB$=4^p zHai@D5%`M3%(-;`!iy4(=WYeNIzEVg7`XPC+(1BoIH7VU0aid zBKzrkBKIREm}q{VslBI_dCs4T(^GT%9huta+ePsnVcyjCWl=>cH&==C+_h@XSJy6N zp5@=T>}%DV3NztT7NI%9Iu5xPn|q}VwjS~N@H^lW&o$kp<+8PGG23>^>y^qeSEF5sm_=ERlou1`ZW(j{)I=>Fctgmo0#dZek`uD**SO7{rI1DE506U@6B)I z5PR!7J87l!WbL38eqs5|?la2Q7o8I@TJ3p0Zhq5k!}b2P`x`#ko%Of-pk;By@@(N> zxi98bYu-iiJdbvnV$+=Jx%%tkI{)wOuiC8cZ?EM(wPnqX9oIxI{JyeTtL;&6#qAx& zXX2~&hT5((b80Y;zss={=uO$S=fK)2AFdsX zZ|M}cu=#3TDQ8monltgmj6wdf5p^$hIyM!pj_K0u3oY#7Tsq-|WP;&zSML?6*FQK- z-}}ILQ_f+n_{PGef#PzF4cVq8e|ZDGPMvV(nb4Ny_m)`||GtsZx#-E9O_dvBs#nil zWnHmN^X)5n?t^)~Q6=#lNjofbmorYcSlX=|)!18|EdTlof5MKe@+%AVTlh1@?tgba zaQViacia{~Qm*tpJ>Ogyb5NP}a>KJnoQ5ZUEmzIzn4BaYv(f(I%Mcxz;#&ntmopa3 ztnlGEQuT4~KfcfH5whXQJ>mz;i&!I*by)U>{4ZGk+JW~~*S7;+f1B%sdCuS1|4@Q6 z(RudY3+2{3_P_gDF|%}m^oyLYoY%THWT|?cTN(FIr%*xZNxBhF({r<^+q&X=^nT6b zJi+*O(e+hgBJnmF(%;)sbv|wSymsHFgC2e=zk% ztU|Td|9a)VDH(cg9gY*??Vm4~VQlTJ^nY@m@z!Ui^FcYASogZ>Uz&XIo%CacPfy5QF*nT^+n&USlwsW);x?fbzJKBvj4O`*B{BOt(hU~vyC6HKXT#q(cSu^ z{=e0`slV?hMDEjIzuJ9l@dN9d`~3s_SNw}SqWtz4^X$kI>JIZP-*oj(@?^XIRdj)2 z?9s~sn=_jaozp$=cR~19E;b8+?LQiqiYumv{^FNBs9-0Oenjwq*SRBEi?ssg1tbP! zxO~vym?Jy$R)OVIC+#A0nZf%Q&jrM{Y%WwO-G`}etd9-HX$IJ0?+j`;Z9{m$l{e~J6c@dWYg{P#1s z6Bp06yS-dyN6FWU^Xbwr+Dl7ICnOcW+ZyOH<9JAk_1i_y8edDC589_0P+jtQx?F|K zx*p5IuU}j&DidEHdF$S=RVjvr>5x}j^5%bD_3UM$vUP&^`xz2~2?dfQ3?mI2Cc(+s3QSF_c zD;0vCTKr^k)vq>SSGqELYT$IH{TmL%OI0A^Oq3Z<=ik$jh86et3>!erWU6s?R_F)$6KszmA&q&uwbcsmgvY13*k!KG|AG~((@$OP*(mUQ!>h%nj0<>QX?~S57oH+!8E(1w ze3ONiyx?7hEejUM?&kQQ8UL~3K>31mD-5nqT2y{*o5Z`KR|~3GY?l4LqGK=YzVC}f<;lkI|2mWa~`o0IQ~TLaKY#Qe$Pi-1ZlhvE-ioie1Y5iT}yB6=Q+M?o&Byl*^tkfYn1mlZF-xvE9^Yu z-^qpZ_Z>JZcFF$OqH?X(b^*o*lLI9A_uH)a>$N@H+MaQC(7rFft_g?C`Dpz(OF(f^ zb4E1F(>OEB*WJrL#s1V`+3iwyzgDjz{>$uWP5BZ_Q-6L270Z-6M+-V{{XD)_ z{cJU-e$5JwiU-O}dDqVTJ)AoE{p=IsbB{25IP<-7k(0Yd#|gVh|GAFvL|9e+jL6u( zq3d@?UBZi;|Ep{dNZCf#$F)3Pcy?mo?ALFt#8w?QiNCc(dCslFIg6Mv+5eJOGAzCt-vpyq35*6OrOJ0J*UuYE%#@k^v`9>Z(q~(?v!O)u>Z%5PK8G<_7??DD7A)so_Y6Q z$L+@*+6n!Keb@i{{XBEW-@KWN1WXp}t&q9$`wUWEDCaNX!xe`w7o=U8$NYO!!qrp#R=%E%e=b@sEuP107;{G4 z{{G?Ab(id4ZA>sf^G~#$BV+4}#y#Pe7tX4EdoNe4>0eB!sohy$%M_Z%h+hA&-!4|+z`ei?A+k? zC{d2#)x~x>g{Thoqs|W8ZJ$^!^el8@&^kC^u2igRaL;opn#IYjSv1U{J#9@vV*->^ z;ao+{i;28tqujX21woHG&?Di;zX*VUkxlhhf`0^~_-P_mo z|8{Hcopw|5`-d5!|FVk{58sYA`TdL4piKM6Mg=w(=8N%PG~b=lays|I_6_s7(}Irz zGYtQ9Mm0-2&TX`<+5N0}-?Cd;*)D+_SU$a0)b^! zvW|UY^fvK{f3`l{WMl6C(qk^qx%s=def`5}HK%sVA8X%*cXn!ZA7*Quw|bVe{lXVt zgPs)_KT_Oz^@Gx!JH-zU%-Xjh^_kLc|JTkB&$AkT)^EtrtLl2brb7Pxgx~91LxWB# z&(3+kZX2|p#WX%=@1CPI8rv7A9bb@sz+%;hb|-ZOpW`pycW;RC&iUy5iPe(j(jVdV zF*kV)`2xMC={Fpb`|0=dt)tnL{uBR>#(IV=n3dt9d|_*EZtqsbZLhm_T(w^K$^7g0 zYj>IBYEQ-MOlOE%$$m9hWbT8@e-2)>p1N3zf8S)L?IF2r2aRv*=lvCYv(or_{X+E( zeXC`d?tJ)pdB)dg4c%w1&VQj8@ONv+m2b5R)|4;pNXWkszv68cd%}Z~iBekLb!T~% z{Ox!mr7vxZ^KIX;C%0dhr@g85=dnGT6lR~=w`u3s{Ks>P>Q6~|2|W{cNM9xQ%J4(p z%lbWs*f{=gJ$jm$|`DQ zH|1I0E?g?BFRwp7zkPA~^{4p}Jaeu@-(cJEIC{~hi+8j^(^ED|%R2fW{CMiScDqd5 zk>`Eit!JjZ+hxh%_Nn^|>lUANAz{W>az32+`uj?`-j%W!({5RE^6Y+dZ_{g5D>wa% zr}KXA-~5Z?wu6qz74r%wkFY1jw(<<;m)FexHJ$D4!tE>iME2&d5maV{3^%V+Rf+55 zZ%kIKW_PP+v2oX)%UcmV?bNk>ndSXw6YgqHJ9yny>)s5;r~Rz!*S%zQyc@mu)*q`6 z%lIySHE2D&(d|uH@jmIL$#M1kwaSIL#SfDIZs9vzm3dR@k|Ph};*A$f|I1q3 zsjq&2RNncR^L2UeU2IA73#P9xxUY78gXEfOm-@BrFBd+T@Yd+`QdXCWuQ_+lvd7%2 zOsllx`lb1HN$rL>uP=JfdQPoBqGR(#_=x$9(u{s~j{Kcb=MGj$PJLglqkCS>C_b*O z*!#Pz?F5$e^>6HX#hQ(lNYy~^^%<8DxTQt$I)Q$B28`NwZtOH04s za=9IR=`xSyZa?CCG-rikI@9;reDBL|@Lao_B)NIls;HHA0v6gvD-Q~-NQu9`-A^)L zb?B@j1|AEMjsDYCvVPpTLru@g@9UQrU-$$bOHJLmN9M`#H0zXphL2ljDA#Gc^U|tw z(f`;d!OeQMxcXTwH+y`%m35VIN~v#b;a^Vy@0R@^7QHxpBqHh_cgP;E_6D}C*{!8* z2TmMYE?vue>R`mtAI2e3vDuE3g#|to1%xy|U6B0s^r@&oVUv#SM`b2*RQ9J!Uq0>p z=IPqSVlnM|t{1zfOk?~wXNFSQzwGVL=WUc+V|{dvubX*jbSck{om1)#rrTY4c}02k zYt0Rtiz_ZKr9wqZWlr&HwQ$L_sEd|HhlogdLneE_l)YmFZ*bbD`;u7ANALiYG{9Uq6zkxZ~WX z6W=769`??*z5Kj%L-F?auT6Mfw|)`xc+;S&6u7PFa=vU;O0xEjJFk3RD25B@wrJ)r z-^p6GKiN2<+>0&TlhMh=`j$h%?K0h4K1};(T`gnd+wt^j{F75zr*$IwEVung?zCR_ zrs2l>MSsJmGM1jRxVl5e#rLAu7L9jayZAqfC$==ituLCQedOd+=4)G;Le_WdO@Gz! zVXE{~r>=F}xi2?;pKiL;JZ4^D$^*l63)8gSr_VJCnCz|V_LF?@dsV$lfarzxE8VX& zT;)|AXMYWS?&|wfbVAQ zV!+46KcqgnmaTu2VR0eJ^WCQN2Y%Wvzqr(dB|O_?CLLSeW?9y6a>v^XN za#^|mU!ip%aQ)rzX}&G5->X^9`^^4Ojs3LCJ8AiY)<@N3{z`v|vyInhI?TIUt4t_s z{{`KRpQS!%=m@{KEnK4dII#3A7i%g4%U zS&v&K``%65T<~e)U*BsvEN;TO``G7L`m(6L+qrS;hJRe2nOBR0=5?9s*4@mpQ$5ygzHmeCJLR4G4;{Q1Xz!lix@OwS&Fk$Ml)Qd$=X>2@ z4)2+vrn{^&WFmuQ>ZN_Y>zNJj1!h%-p0J+&cD}7#h1VaYcgKVeDlLyt&pz#NqDD70 zAj`Gmrch~Cr2mJv;dTDLj91OBmF31VzF7SCs+do#S@xEkU0v!&+5;?X_s8W~9kJWJ z_R^v530sYlbG*0(ijPWOY!Lc==LXL;c|%|S{>!DM!UeNl|C@1}wIk!w=ia>91DP{! z^KK7!^uN$sn*I5oYiH_)9i2K8It$9~?mNOuA6&4oxLg|kZJw1v?Gr1@`PT1~c0XuUf6${ouVBm1UrVJ|AMTac*Y$tJ zy;Xbrn_K_A3+_A;dKf7D#o})K@0tI%Ys{C~tP~p}oPYXK!Nb#!=j~p0;OFDxHD%Wr z1O4`BsG7GfR-L-&wa~116QdocO!FcOyrmSo*FE{}{V(mW-?zu+ukU<(zyCg;`E742 zm-81d2J9`|Ealtt;J(G5&lhq&my}8se9+s?Q-56d;o{j7Ce%JX_DP!m@WFL~+>7rw zG?^D2Dqi1QbMAuozWA1>|N50~bxnLEsWE4Mz0rR*8J{?-?4zdz0tDi0-vk!ieRg?G zi0p;4SNTLw%a;Z|t7$nD|8C-Hg{L#QS;d_d_0m$$n{qEKy8hsjZ}WlwRa-;9u4}lr z^39d90|&I)L_QwP5Qy)t-DLBm=cK?&<_7`Cwq+kt*+n-pQwC9MKy4qgk{IJC2-yJUDlKwx%&8hz`z1Fae z^JjUeC4Mr$ah1y@fgQ&z&lMNXn*Lg40>hGtCqxzIrmSPk{MEIu==L|0brVwJ{Fy*& zl5%ff_I#wJ#ym5}t}pX$$)1vRv#ymIg*z@UbXC8*EnZA>3B$~17J)NkltoK?ZKK^A zpZ_qL{P$kdt>)cJOU^MJ*4urpZ0CaS+WKFWL@FOKcW0kuFm&x{PF`(ZcJ~oqr*?n2 zMI~1XzvfbDfq*0HRR6Dzh}xvPbc*JLIhDJf&kQb5$&NkdR-JKU%m00LzZ=i(2=1~! zmd7vl)+IaOG?%_K_rrjrPuoPL56qbSyX_WlV)5*`FMpd#l-(*X)?nBh+-q>IMah3= zV!yJU1IyY9iE~Siw&t&7y1rcft<8NVnKrAh1-&8y02s0_b||wr)0~#GwKJj z?p@!{@cK(gTGPEF(`(pWgx5T0to~A6!{A~ZSkF_nbKa4V1k24|e;+9ND<|L7m$v91 zOT;pD1I~zJEPqWm#GHSieBpFOe}6;juQ~q&I39&+HO*Tce<`^kwdRmZ!pgev{rpvu z`#&(g$bQB8Ri`3Xd;9J;EFUam3{?*Ze@XbdoPYK0HCw*W`V5mr z|FSezzxvg%jgOT%WG@v&zTXwFE1va# z)>+5ntCwa;B|MlFI>|a>)1x_;->>A+keA(In50=E`TNJt&h?DzN(4+B{^nfR&%l23 zjLd^2_l`?lXuq-OIn(c#zFY+pdDpN#`syajDx=W2-SPN_$p1WV(v@Ex(33rDw7@v< zmwST#>z|xo3fE?`URkhb9>2T%jj0>Y$UT~yB%YVW5 zo{f)rPJP)c#<{Qd{rS1VghS@SjrA8DFSLh9ik^8J>+F5~_4e2!_GNc}IA4E%e*670 zqxwzX(!-bRtlbd!H|_4Gk|Uzx7nC)Z{&mzhj|+5D=vA5Yf6x9kqDr_cW; zH;XH2@52T~t_+9zUrq;)-r?P8w_($n_RVVlSzhkd`{q5DH}=Wnz{zTj(V6Qn*Yz!U z{aWX%;Wc00^*e7~5<0nP-W>KlighC523u7=@3hUE<>`^-*`IdOD)nYwocOf2^;=E; zJbf=@E%5GB;Y=3K<9abR|5(@jder_o|Cz(JnO_cuPj8CQFM4|TPO13EchM1I*Qdl> zjko7*oT|)jdW%m~|Juj(wE{g`xuQj;F|B*~{!4$@F2`#}uhji&jabJpfhXd;`iA~B zIimRFUS&Hg}FP;(n&{7h$!=@%mB3N`<9)_Qb=d6Dv*uG?j4#~oI@ zyYa>2aaF)d|GNjQ7#-NOe@dRa@pjjS=b0WArtdCX+;$`@)H2WhkB=7I zVBP6!9Cz|e3v;A5pWgYlJ?l3;OaJZk?7ZgZp!qG#>5Jw}-_Mx3ip_*4le1Cw(5dY* zoK^wz1C<+pt1c@jES#HCD|bX>W1NMwz>@2_UPW#)IzSkJfeZB|2s&M9txpNZo7BIUYwk4L0%XQ#|q!!*-4 zc-iuAP0ilZq!yocI(W%u`=5OZR^8W+bRVtVWahG@BH{~s^6aLSt+Nx#Kgsl0#vf=5 z4iukuzU9ECMB`{XCedA?fA^f@y%2pxVJqK;-?Mqn{O``Vu+YkLFJ~xkB6su+$D`Y` ztK9E7`@dPo8+N#t|J}Ra3>7h-s}Gm6z3|G~^{X?w`K8&vInhkc{5B76w7<4BU)!|g z)bc%#?z7)K_du(7!`3zL#LpDTZVWFI@l}}nBz}^2W8(Z7FQzar+~|Ay>pzYsCA$}v zU3Aci{@V1&?&WWhgJ%!4^evsUdslqhF3sFDo`Rjfo$qe#EUaF3W%JTS4US36W^jp2 z3Ku#QBqIGxZ@~(cns+!yv~uN-gW{AJ}nJ7@P? zO?!7M;q6U}^LY)$nV}g}oaXWquV_UOAOG z;d|DxuXh|iczm20wNC2Ax?9m}7rZ#!b7P13neUFWrk0x1=e>{LTqVN7yKeug$8igc z4w|qTd0r0h{+;qZS?6ZuHxBWiOesEl{^b@)TYUJ^#$R`<;(Pn#Q+4oN{CqD>z zn!El@4>M?3moa+!hwl+7+<#L_U$Sz}=D#g_mqERD+q+wGe2SlyZh!y5CAF-~=I4>- z1oOLkw?5Wh$X+9I;_R{5h32nYe+h4xonL>V(6D9YGSOcwoD#aLp8Cs1kB6F}0Yt=l#K{(-n7qJ^I|=rsRA3?$@i#=INi%_{rlt+Yi3}U+UKRG)eKv*OOT@Or^iY$A0=0lwa`g$kEkbl2$C0lG;_n z8EWG+FZUWFQyXjT^$*z>3d4A&WXB-de7R*w)Sh1 zsME#t%|F*Co;(-qx=+(q@#(?S3zs)PsF+`y9(Il`?PK3NPEu&9-aN^pAV`Xx-YRBa?1~oX&r8ykOVOzIVHiJ0I#V{OA7KF(UEu z#=Xy*t7iutK7EyK_j1{9Ry!SjTuSq+{oPo+>b2DRzGo>ck|KK(t{#g|?7H-E*1J`2 z5ANKb-IiX!B3ao$}1`|JkU?bDVSXih88+`j()zuiwQrsb$ld;0$W{c}_PID&c?!56+| zwNx>mQ18|`5Y=SYy|8PdZL0K%oSLr}vjqh{yM!!$T72NWOKW_#EyvYoSL$|s4NK_P zTYRnYpQrsX=76-=rE?~n45-aJ@}g|6!n@VE=XG*eGB$e295RW0m(lupTjC*^AAJ*d zO}!Sd*6(dzuE-SGC`+q194~aUHtgb)=t#{GoR%%fw)>&#ABQW`FQ>3{oJ^X#f%((P zpJ$7IAJrR%QNY-x<&WrvHM^$IyKz@q=XCeZP&2`Y6MhzUWxvY0@%?qv%x+`Fny~9< z{5lon7RV<$%y{9VzJQUxbDx8RYzFtDeH9bz9F*lm_?dbuI_eyhKXUNT*#4dM;)M2> z{3e3@pA{~2r5_P?NS1q=D8PG^`3tkurwK3Et0aZLs1!uKx^_WVbdP#SM)*GM4_eX@ zoKGfsKHF;>{a=6Hl%+Z!R@VjY=X0NPjVHpM|I)fRyD4`#Z_TaTacaY=2Rja`9(k?TJPEwp!YY z%TD7tvoCA?D{i^?so&Oo;A)wZw`Wzl=7gJV=XvKh`-OcCiPZSix4<~>5ciEUPPU?Y zH|L(ZdtK&|TKw+1oq`=cH-pwNUYzKd#B`z4aSwBe0P~S(hvX^)85ef8j_r+oj{@&8 zT76nk!S14N*zwV!nysVIL0vA@=7J-S*!zYTCl1Wszn^uBICF*cixUopd@j|W-^U(F zFl2mjbh8ipMNb})#|_(T4n;e#vvq7d!0=J3xWTKcuTF?>{=J*#r{q6z75As_W!=>H z$LZSs@2_^HKYu=3rFfR{f!#8R@)EPGO*U?4zSwJiB)eh#NohIzRe_=(6dCFl^sMkK zT_EGA#G&Eto5hg2vNLt>u1ZOkMRN>t*L%nwVyr*psu9pA(6n=ETNemc!+vF!VP zUkF@rcSrSVy4!7GdR zhGdv7e1BviCnhK?{wXTe`=%x%LUYCE#O~?xF-bvLufI3i6qN+ly*Ojb z7U*WD&aJrh%hd4mUt2?k>u&sers#2d=B4LFngZ=D{T18=N1HD_TY5hC^|>97c@N3z z2eK6i-%Cn_6U&quhHCv$^u+Hi1_vUqu+w=0T z)ozvEVfS+D_0>Wz*uR9%t^M57-N&|Q{|n|G65XJfRdr!H*SUS0cYj`(dEsgA z@yqIU?E94eX0uFX+8fJjnD?;%6Kl87Kktp+znspkSaa6A?a-@N_OZ3q@+#A;Z)=uW zonU_&cG&yQt3#kFQNJ&0k(Jc`woS*izH-X)%HHPv^>40DLFSvVi@yb4I9j>PUGU<# zQ1(TK62`x+d`5Qsx82;|&i*DOvvPa(?@K%rwmxx@Jg_$M#O?bR?jKkFnJY3W`t`J} z_U~`~tqgzvegFT$-}1Yg>bKnuiqA`9j&zyq@jvEOnx&)vsUS8N;g2gSmT=^~m@Agw zm!A6mvB*Oae!+Qrm3D`+ZBJXeYPuBTE8oYWo3HPQoyhe&&oz35(%lDto;V8@_7(j4 z(Z^rD)H&nwiBq*&4lnah)rajhdLjI3k`<$b$FJbIQ-89(PTbY##qwPJ?y2hYO&|81 zjeAqgx{lYs;@_20jhK)R3HOW@s=AgRP5&Qf`~Uid(_gp$3f)kD^C9zdDS>^Q5 z_2APf)xAOf4RR}1Nz@;#lAIBJVtz`sM~8jr`v&K1#%vP|rI<>`}R z<+*q5r^K*!-aHxgKJ1(p!>XDK51M!BJ5HU(D|Y?AM93Vi<%f36T(+8HW5ri_q1_7G zJ&$$Ilq`5~XOj9ftpd{>Uq2SNMfIE2EY3C;=sucyQOH9zaQ@E4uQwf*`{HRE7Teg> z=ooKus=-Tc>o>E1awSdwTr_^iwN)xZ@mKGvEup8(Ia40H#9tKj`?n+aDWA1R&GU?% zldmeSaoa3fTXbM=_{xn>t(y5RhF_7svv-48RQ>XJW>7tDvD4v)@Y%W-yJcfe?cDyg zQtFGcmB;_cHHFgkeNT5vu6q5_`@yGaw=>?y3E1s?d2*j!Liv%0iO-u4B-zIHZ*clK zP4B;}pw9kgV^jY69ZQW>_Ei5m)VNt;R@eI!ZZ99UXO9*=k<>Y@b3g6x)PHsk7r4o=ozsD!e~M z$iZ%B3S;*d6I+>8{_B1R{N5O#wmYccgXD$XS0-nvyXxQAx?|ZJ)1Avw_Epvv1z8-i z-Ld!mqmuzM;xcq9_*|SXI@$!@nOgEcxQJ)k5kBS@DObI|HU{lv{Pr(hVNdb%E?KFj z3Xe7q`v;5cmONe)uunhKHTA;8s=4=g+n=xhmk_IaV#mBGldbr&j&JR#Kfo??zu5Bm zMy@X`wgKTL|KHnZGR8hz)5j{Pa&PKWg&Ru)FTX23_Bp z?v0hAs}w6jzh_H)U~1{fE?M&1LcqT(`BU%%CH1eiN78>q@A)V^)nUJ9{9D%JayNfp z?fN`nlWJjUjnD~(pR-C99a(<=*LDp+kSmd+hDfR}Ax{PuWI) zlf2NEwM6Q)Zl!Zz;>iPdoV+G-omBTT@BS~^_hh~8rhAN9yemRC7dn5i5BR&dDsaK} zRmZQeRA*<()R+E7 zc9Ri%N76F6qq>rfz1ENZnMX|HIm3O$b1K_Y^Hw*O{oTluP= zje48&!s>r({(LSlD16DRJ+Ia0`;-+^%pLwOiZ}emEW6^-RgVL~GrnlK_8RSF;JNPm zwRA<;!f(a7eNH!Br@FU!21I{N*g9{K@f20r?wrKka!Gf1QiZj6dH>3+dcWfG>b2qq zp8OZD8l3(1ENbDOv@asc2Q9WHo!}9*#3{``j#vKrcYViu z-f8nzRloZ8z~W%(q-@p|w|6|Bk+=6?X@g?<0^p4;X+PBZ>-vz9~rn4JGTTLHZ-mJ>InYj+fU?BqElWuzWXm9@Px1Q9=nVS@2=2T}L|F^He?C*&!xvL#hy0;YxZ&P6W ze&TQThBKS9qE;XO+AZ)S^|4{^E2pEM1mmyI%J0I;Qz%oNNPp$3&V}4H4JL9_8+Wc+TdEhHa&7-&FMFf!j=4& z9O~qYj=MjNbNY9=$f6vBj(tWK9`HSx=&N>O*`sJ@?j4^_{Cw?x?%+x@_Umh>AIN?b zT_`l!v2@d+%Dl9R|3r8;zu9hC$DDZ6*ZZqsQ?&j0&-;oU%CE>}asIddI7??!>%Coj zZt<*JZF_3UKbAwUO=`EC4^CMAHrl$B@!HGyFD%+q@(mj9t2dd$Mq8{iUh&BO!{)htjrm_!U0wBtX|Mav6F+o7{h{7zox$sB_%?bkl3u@xUF+(P)rI^W3Ku6m+x|CRRM08-!rq?U zJ=Y(2JXojd-S2SgVD>uByN*k`)QTis-*3qgbdU>Pe3ezhc5zd7FTY}j%ip_m^%$7BWxR)cK9((|DTyy-?X1Yc;SNZRoPw+G4D>D%RZ!N`XQ;;`>w;3Y0^)a z@_rgcZLrzEx@q+tZu6u`*W)C3-LJo|O1{Z^p}Qp7RQSX4Su3(zKl>SKzBp<$QOC+b zcRJh2*nX##2UAyvRZ4#`HTAXpcz>#G#I6R(SJhA1mp+@aGI%N9m04F_Twa&$pwh`< z$?oxNkzHczCv5=@C5QZL{i{q1N-n-zK3%Tub?@ZO=j~Y!Df~Vue21$)<*|I>eVap7 zpp~cm-*jc8Ei9amER}1G&2FsTwEi0}n{3*gbQ`aW?Md5Ci0$%-=Tuo|`|DL9>+#=t z8hd|QU5IGuc5gWSK-TV5huY$VNDQP*@EtUxn;u8z^&QMKqRY<9y7O20K^N8>Lf42^G1ymLOOuVYr z_|W!uBA-07_Sf%KK7#SxOm{t=uROo-)us=Uy7f&zUKPsc`n7dO``c|R*YC)F)br5h zh5VPxzakadOMGs6do64BZ@IVndBfkB<;P>bJEh%zEj-!E>5TjAv~xQdf7#l`R5NeP zxl-IHYc)&qK$_U=^9{K=X+|$}t2pN~Mn|ksXTEK?HvgLUm-GeKKN&x6H2t&SI8*dj zqh-vdMJj$#tf6JO}lXV))(p!x?RBVTUdUQfnaN{Qh zwvNn4!3QqOtoUqayyd^m9v{Jl$zO!_^6=>2SbFd&qR`m+{kE!#MMlBGn>CBw)^rdu!jW%0d;?0L?p(9UzI z(P^%K-%qRJhMG?$+cG`P0vztMG=4kE#o$jtB<2 z`7E%Io$kw~)|?&l_}lMa&*fG0PX&rq#QhH9{KUQ4I#r)x?rQlf{`bHAu02$nykWw! z6a51Hpv6}#-o;+b%jEp46vH}UuZFJi zU*QhExfV|kKUYk=H_`C8vqPWBmkGR#%0IuWcx>emf4=J3G5>{kK5A_~Tq#vOyVr0}cRSW=cS&g5eyi7C-lzsxSnaR=_gi6B*TE!*!uT7y@8;_* zv^3joqAughyT9PYqtybt6OIP2mTyQqEB`z7L19AA3gttM-d29{JKKw73J z_~DO(y_2`CX*|N;-*0Uxmr@=Xb&HYld&UZ#8LTZvL3ODaJf8RG*cX^E_^s`h+IZUs+f$A(Vd$0KT-U6%WVC$8FSJ^u}! zTMMSoj<#@B{xM})g`bsU?HaBF%R_d0hHiIWyQQr&w%Ym5H(lH3{A~x4efRbKknx1x!q3~zKeUtU_iOnTyiT3#TjdohI-hs_ zPWgZ0uX6T=gqNGn3NLLDPI<0kHqWcg(Mle2z`?w??tP3<~2qw*TIsITkWYr@%QxAF9b zHQXyMdPzz%O$L zcKS@H!m*Crq`ji&4!eCUdcF6P7~h1iKfg|pc7K>KJvCBWX2FBScbI>sI+O^m@173w z#H`=v6CyX9;EkF&$$HM`+uwgReplG{@!aI<8pmHJb&ELb^AqaCPgxY+*l2lt_rZ_4 zv+M3ivG@qMAF1kzZGVs zcb9nUUezhs{ow1?`!yWp`E@(*Z=dkv)x=!&U57Q7=k~vy!x}T?eD}eyHSE$yo01?4M_Avi-=X=oI(oKOB4#LRw!;oABBB*3B&!74`}Jd}MWP z{=Tg>57WA04~Z9rrOWMk$6hF(|9aO3ArY15U(ZHzmxv!eqJC|K$L6@xmqq-Rp7LI} zsnTkSZD?h3g{j4jq?d1=-kT7p_Of}keuIU2`{_oJyKC0;J~}w($k9nRz8|}Enp-&B zdCv1yf!V(s>Vj)m)v;=ISzXb4H~DY%yXxlB;JOPjT$Q|&{`&u~I>z01CN4Q7*_ouxI6#pFw z-W~hk(z;;H-*!xazCDxoh3V8UtMlE?+WyP$YHYP*Zo63MFMEDT_eoE`nhAV=xk~+7 zTEn{qkH1Lf%-rK`CCVYV)nR>D<|(;H$JVUcV8*`AI%d|y4IC|#=cw;r@}k{o&5^(P z8+4`^JvWwF?Oe)i@#n)U&ey*VT>bd*?m0b{i!NfPT=L2ok6J~#hc%xu51Qx0+cLw{ z+jdd5)4^?fCj1H99+h{rA@f?QeD+U99=6>%?b{FTTbsP;^z;LXWgBjEExkSSQR>UH zSrekTpT@7S(yHMIc`fbRunez|DQAHLHQysVpN zpJ`iiCV031_V&l>=54w6c(#ZtAHCe5yl#ic_mlT5RgWh`CapSt%5IZv%9WkBjF)O1 zDT(}b;gey&i@Emd|G6%B_lV~g8OJ}o`22eOjUSvU+pX`a)+wLZ#+E+Q^W)xzwE0GN zy{BK6RxHSU`+9BjfW=StnR7Jgz{d$Umg z$eZ4-NINO6;!pQa+~+6}(CElb?*B8Q(eD? zyZ!mPsE?p&hxRSeg#pAA5E2@}mUjII$TQBK!S$h3@QI1cE&Ff>` zA4pV}eA!=MC${{dj;Z(b)}Z&(3)jryRt)T&|MDN_oXUdli+}HV@aG-#Wg8x;B)it+HZXV2c7?KuQ=p`wrt0lX;nOp3r&wSBUHbH*+ z+Znb(M}3^|JQq(8`)kji&?lGw2Z*(;YqdS+YUclvVK)vIJ@7~TXu!dT?J;l zF5!5XCjK%0_@hOe{cW>t80r!kL$miXn5tc$eR-jJL1Xe8mZB4vGLIJ2O*>FtyJi0^ zF1`EJDZgyk9=WcJ(1l<(+=FT@y&Z&cW{Zjz0R+0 zzXGd*+cV~>D;#`&qS`&W`GxjsPyW1p=BiVF`@gK)9wPR&gW+v##k~p+zrQ>FuAG~9 z;CD@vd`H?NLqTql$=Pjj%l2Q>Z~V*B{(jDE=O6dd=G8_wo#uYWTx-YjcfzWyo`pYR z6?9^cNdL-y$~*NuyZzlII!E*^x8z;Uw0N>%&;PE*fYj2zQ%koyuPkP~{P%c+-eR>? z`UbTED%)#pp1!|!Hull}yLx%MrbWbLFRA>0fBkGG3$@~|iVNJKd%W0fJyf{Y|HOnmne1z}J&M6q z*8a7hp?hLLaH#5I1CAW|d;3H4GlCcY@45c1F>&VK%;UWWjQ(z|+qpygt(lIe2;0fM zZQB(LKlJ=vD7<0US%232-wv&|54oG<8b2jBEx*2s{g>k0RlN$YF8P09k?Oejg+b|s zyZ-{ly{`NV*1d4|7x?nj!RPU%-)c=C_%2IvX#$R8SSqFrF z5w&e_+H{g}_hi1aGF%H^dH3$iHjs%?vemCBVf;Je+AYb|wH!y>ZaQ3Rdg8p?`EmLo z*Y(bGAFpEUcCCEKyJ&Gmpbh($bdkf2d_6*k8^0xqC_8RR7g28f_NemXnYDjisz2_L z;N0@O(rw1J+5g{L&SSjT7ig3HZ-4sP-@N8$pPdrfap`}>i<4^$Y;rDd(p}rg+Vd>; z0JHrX&FMd<|9CIC=FzcBN2S&r{-Rl+_kP;buc9SuKD_u){>_b|MvB?zd;t~T_3O~>VH~za--v6xkwgXweQ{UZN*CL z=dRh@kdv3tx^CNs$(x^=?AZ1p=f_U-gv_nwyY}2?y)<1l*3*thDY#DK7z5w4*QG~9 zuiMA&ddOw*uy1zdOFoO4wOP8i=jP{?i@)3cUft(+;J9(H~VqMzZ+Bk^?#J#vn1(|5!;mI&sJzXc>D0X&(co< zm&`uxeRoem>4=CVlS+Y`yw1DHdl$bpJZT{F#p^1^9jzx@Hum2>KJQ)W&)ec}*H4?aQD!qk_>vRbpM0KhO>t#lkb#Vp^xO@vm{z>!$`<>^ z;^e}9@fz3H$wy1`7|tDXu5kEJ{`S?@SsZn`Op{mdwo{p{(pab z+rO$zDem9>Qd->qAA0{Tzj*v>++L;>UgtG;LpknVd@?t#{orF;`T1On9j9MzzvAE( zx9>nram(3CpG1ie`RMJTzZ(ONZ46qSpu8eBYepga(d%1H`JKA2D!GI-1s{x_yv?42 zQ@8(({WrN2b(?mDrXAOb{U4UqZ^f0@UVG}d4NIxs*B959ir!GQ`cm+LVQ-xOW#jIJ zasL+I;JIf1blK|ex{$T4Mf{;J#qM#eQoYWXZ!9LU#`&seo~q#nv1_wZx9pj5xTJO} z!#VvOwlD8;99nMH`#zfQ&3Ox(mo;)51rhwJN(UKlIGduG`}D@|jqlS77c{=76uSPkiQm?zFT~@Y~kCj_U(Xa^-wH z+Ql*Z;IH-?wrE-jJfe)#XK{rl(aeVuy!)i%6UYu>Hi+qlTDGcKb~^Pa1X zo?6ol{X0)rHwdpgbh#wUbzb2uxi6l7x9wsQeSIzF!U<`ul~LMK`?;+gXUBB$EIZKn z-%3pW(z;D+rW7Q``&_;eU~xHn`n}5%DVjUo&K<4t+h_dsaFv0DSy^G}Ox{wnFERJN z78m?G_PFc#;RW$mM7Nwg{Agd-gUCyuy(&j9ebQK*e8o8+)i2}lv*rW;L%z=Z`mN#K z!nRepGd}5xeVrcKETLQ{kgk}Y`0cUe{sU88pWosC&y_N9+4>}@%NyDrc3ivv>iU6q zmF*Vl_8j$_ZoaYGeemery>%=1Ent5!%Zl&y)*t`aF1qoE`#U9m{WJF`Ux7i*%X6aY zikpkPVor%Gn4R{Jbh@bh^{lSOR)@J^F9RNSKX`r6cR^eB=ZU`Dj^8gl|6=O3#{10Q zrn3omb*D8{^p>of#r4j4uho>FOo#Z)_g+b7mT-F8BwNO~J7VSjOOv?3>|MotK)BQ@2*G#UH?vJGB{S@r8+xYImGV_L<+SvOHF&~ee z=6WiBHT$dEgu8FUB$qk;@Q!_%!ai?iYW9?syt}4IEm!+IUtVUr*fy=*(Rl?^xewev zBiI>GTy}V2?4N__DL=n6xi{G@S6ivmwJ$rx%;r%K$CS&8dt*-RI=%nEL}lyUdT)8I z=c)Xu$zqZDTlSs*;$(;0uSHi0K5%yx%xSIKaYnM1!)3z{hp@JU_inkn-J8qT#NYJd zc96bWBkJ-obVmq$%okgd=@yb8X>htf|1U2qYTl(h!p}B+ z-gw64B|UN9*WX!qKZ(NpS+Al+MeO7`*u$HJbUQv-6?Uh`dy{wicE`o`_He^~{? zA)DE5UpU#WKaQLHcOT1LFX=1%cPfwFwLbbtOIUIFsREC@!onk+bp=W#`=es{3l0bW zXpGRzJCQfRRORm9TmAyixBR`O#M-))tM92S>#eT#BN^HuJ*sSfH}7ioYtJ&x>d!3} zJyjRIv;Kx_K=c=dt#Yq>p5EmYyLnhjP;b?tm2T0!x7{6_<|=FV+466izede==Zke%e>M2am!uWbg}Tlr{FR+%INSD@LK-O?Ep#h3urN&r?n-JnQCO zWVqc)e|P8c6rnk*OHE4LrD96#W^Oc>acTMC(-!!}Q}4{?xL>AseXSdU{jaZ{=P0mm ze`Ln~?*|gQAE&Q->~Q|l`)llvDpgzP_c@kapI ztbe68eO|)eas8;wiF)r+J97#o83eVf&b&0^oWozef9{dC(53}@TBK-&HGpr;DBYlkDpXW-6PA7Pv_6uuKBp6*wA~M*-6<)&knrIZr^uPfU`z#8%OyX z_39gEoc?M`)NQ=~`iFMQQ*+(R$K~!=RUZ3Q$G2B*CyM}IQ(ErzWk@0wWR@z{kuQ=x;Mxz;of3vcJna! z5Xwfr%i&ioK77%yU3Dmh`AG({6VOoOCqe_F4)$X*ni(*BY4ad*L!1Lwj5eHH%x6?yzL-!Vok@ss-+ z|uzL$pb5{q}8_85bBGT%$eL|UNf0aPJgs} zZX~O_eANEL%Nz>M>aVkBr10Mh)A+yR-iqxFJcd2SJT12-?+SY-!x1Nas#oK;$qR+A z&70DMCJFU{A|?Av&ar0OzWF;tSlHErAY5;~UlFhrg`Df5&^Y zE?!*rQ@57sOaH3IkFg33QdjnOKfZaA{fXv|chmR0uF$G#&B-c((evuC@uLwtLgN+IGCjZ5N;0dgx12>(2WO zZ;vV`tqIKvTI^tcku{5rC6DL-(yI&__ZPe>F8$VUZxQ>-t#?Y4{$JmCLhf2ON1&|V z*4t58zoRDvd_7TqT#o7H_Kroi5j-iYWYpaqqn2v_^t}Es;OUFF)xVlH<~@9I$Wmd= zQtsdV3C0oit*()Eao48AJ4e-=I&s9UV9CXE=F_gQY`yv-vO;u)tMbLS@>7gm_9#zt zbewueFY@k#35BnhbDwfN_eSUUmbD6YI*TH0y~Qtj+h|^X@aOXJd-p!F#M~);bbIe= zhbv<9?}^M1E1kr|=yS=rq_iOCq0Pa)iY@VZ*Y@5oDu{V0^Zc6B7ZKYabB#wu?|CLW z{`Z(8d|V+t?bnGOnU0qNSId8%p71^R+N(FKz$ZQbV_!ODVcQD6s1=E?LM{HBe6=jQ zR&nXOpY!$P_D@}S$Lz(w|H+`;o0UDTXM~@-sLYWoTk+9Ne#f7mGxd|}SuO_s)40vp zx@_7d*<{0x%0-LsaHf09M()>T*4tb1YHh8#gNcZ7N^RGjhK}~5+K<#v%%41c`dy(% z_wHOvSlDpq_$IMCFE}0rZ*-G5lOC~UbILLUo7-0&X9}{^;}izFxJ#fz~I@hm+--ez5I+^sS=l%Ove5=kM%&b8u4Q&b8;s{w6d5+^@c5`rp=go)>2Lo1jW_Pzz8AfL?a#gM z@sc6TGV8407U%N(vOe}wZu>v}+*d+>}UL=|FZs$g`O5G#xZrRme5(>WwGlX3b3D?|k_@TIO7PaBOGke_Z>VcO#f}1k*=`#a_M>P zZpSr3FE?G^U%%Nk`(uv;TWj|x{U_mV&3vcTTE++adIx@tB9F2$1nG(d285raQgpY(Dw?KJadfu z&4$B*E)#xurX5;&V8;3DZ=0sLO%I=&$8F@jPjhcW(3GuN2lhJ%>P0nfGTxVD!+Ko( zjqQ$4QXxN$N~%A*J^0p>zHmMB3guU&k1G=-cuSaGsF$?Z@!Kpr{5A7JbIArfzF z&hkvZvg%ExOTy=_3~zYnuDVyaA|m|iY=`d`_GRh5Xsw!jk6+LEPJYGt#s)XjLsB^{ zi@nSD?tJ5Vz|Y1(@&7-aMXuj2L_9m?UGR0|kGyp8gN5gNXK%M~DDc|dxi-3)FKl_J z+JqyVevF;JRF*r$KT|p0nBrH&mD2J?nOpJUr;DP;za7}=SS@dFAbiANr{A|D*I4&> z=Xh%5fbZ?-O}x1waq*D^;|Q~y8ybc;c&716n|bk=HK!hK>lJD~n?ObBKl08_QwyUH TiELwFU|{fc^>bP0l+XkKAW{-T literal 0 HcmV?d00001 diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix index 9f1bcbb..5df8b59 100644 --- a/modules/home/zsh/default.nix +++ b/modules/home/zsh/default.nix @@ -2,6 +2,7 @@ profile, pkgs, lib, + config, ... }: { imports = [ @@ -10,6 +11,7 @@ programs.zsh = { enable = true; + dotDir = config.home.homeDirectory; autosuggestion.enable = true; syntaxHighlighting = { enable = true; From 2bed1729a54db0619681a71a81170340493939c7 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 20 Mar 2026 22:31:41 -0400 Subject: [PATCH 173/232] Update host settings On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: hosts/zaneyos-next/variables.nix --- hosts/zaneyos-next/variables.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/zaneyos-next/variables.nix b/hosts/zaneyos-next/variables.nix index 82047c1..f2d1ba6 100644 --- a/hosts/zaneyos-next/variables.nix +++ b/hosts/zaneyos-next/variables.nix @@ -87,10 +87,10 @@ _: { # This will set your color palette # Default background # Add new images to ~/zaneyos/wallpapers - stylixImage = ../../wallpapers/mountainscapedark.jpg; + #stylixImage = ../../wallpapers/mountainscapedark.jpg; #stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; - #stylixImage = ../../wallpapers/Rainnight.jpg; + stylixImage = ../../wallpapers/Rainnight.jpg; #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg; #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; From 9ba72c53face44c98098955deff105ed0d069b58 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 20 Mar 2026 22:44:06 -0400 Subject: [PATCH 174/232] Updated flake HL 0.54.2 --- flake.lock | 119 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 85 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 8628ca4..74454c2 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1772867847, - "narHash": "sha256-nIXWsnURXPqK4bAwYciu0bLzxHGB9UsmhOmQdeLpegk=", + "lastModified": 1773854383, + "narHash": "sha256-ra8jcAG9WHDsGvqgumqK7Bq6DQqOrbYm18S+TMKaots=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "a610db44f5c24da9cbde3bbd22f1dd4690d9553e", + "rev": "54f7caf3dff6ae6131669e91203fb06f2f82db3a", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1772845525, - "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", + "lastModified": 1774007980, + "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", "owner": "nix-community", "repo": "home-manager", - "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", + "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", "type": "github" }, "original": { @@ -326,11 +326,11 @@ ] }, "locked": { - "lastModified": 1772330611, - "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -394,11 +394,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772773019, - "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -409,6 +409,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1771008912, "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", @@ -424,7 +440,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1767767207, "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", @@ -470,11 +486,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772925400, - "narHash": "sha256-I0Gb+CO6bXi1U5PYgCqnuvI1B+R9kZtamLwhVvOywSo=", + "lastModified": 1774060240, + "narHash": "sha256-D71RQ9AHhosaqotzlPLURm0Dy0b301Tmqfo0IKLzskE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "5f319987a5003c383678f4aae0cf71f78c7ea49e", + "rev": "b9a02cccc7b8388c3dedd0785812f31e02c8f26d", "type": "github" }, "original": { @@ -488,14 +504,16 @@ "nixpkgs": [ "noctalia", "nixpkgs" - ] + ], + "systems": "systems_3", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1772673824, - "narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=", + "lastModified": 1773842483, + "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690", + "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", "type": "github" }, "original": { @@ -535,15 +553,15 @@ "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_2", - "systems": "systems_3" + "nixpkgs": "nixpkgs_3", + "systems": "systems_4" }, "locked": { - "lastModified": 1772875143, - "narHash": "sha256-ENBRe7vCCp/SIG2WRKI2pyAxwnrc9CPuwZ4CtMu4KU4=", + "lastModified": 1773970322, + "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=", "owner": "notashelf", "repo": "nvf", - "rev": "6681e33727409d4ccfa687de981b594110a735d6", + "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec", "type": "github" }, "original": { @@ -592,9 +610,9 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_4", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -602,11 +620,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1772296853, - "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", + "lastModified": 1773792048, + "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", "owner": "danth", "repo": "stylix", - "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", + "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", "type": "github" }, "original": { @@ -647,6 +665,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -661,7 +694,7 @@ "type": "github" } }, - "systems_4": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -757,6 +790,24 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -765,11 +816,11 @@ ] }, "locked": { - "lastModified": 1772858378, - "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=", + "lastModified": 1773661718, + "narHash": "sha256-MYm1EKp/gbBi9wMEf7Lx0agIVnej/P61sg97EruWzrU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9", + "rev": "3ac6ea223b32ff63c45e3577712df991a35aaf33", "type": "github" }, "original": { From 0b088ae5617334cbaaf1d3f2bab10a5da8ef8b97 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 20 Mar 2026 22:48:27 -0400 Subject: [PATCH 175/232] Updated flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 71b2bd7..4eefd35 100644 --- a/flake.lock +++ b/flake.lock @@ -396,11 +396,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774053689, - "narHash": "sha256-8tuH2SJvPi4bjMcXUK5WQYJKql+Aw6V5f3D4UiIP9LI=", + "lastModified": 1774060240, + "narHash": "sha256-D71RQ9AHhosaqotzlPLURm0Dy0b301Tmqfo0IKLzskE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9285188981c3a6f44c0de45eff881d053a312e75", + "rev": "b9a02cccc7b8388c3dedd0785812f31e02c8f26d", "type": "github" }, "original": { From 8e16811c60bdc53ece3520da22c51db5a4c25ddc Mon Sep 17 00:00:00 2001 From: dwilliams Date: Tue, 24 Mar 2026 00:52:07 -0400 Subject: [PATCH 176/232] Updated flakie --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 74454c2..6fb8e06 100644 --- a/flake.lock +++ b/flake.lock @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1774007980, - "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", + "lastModified": 1774293042, + "narHash": "sha256-OEBV+Y5I4Ldu98k0KvGXRfJYh+jjE8ocCSL/dxTGs1s=", "owner": "nix-community", "repo": "home-manager", - "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", + "rev": "bc357c75e3142a31b849ba49c5299fb52c61cf59", "type": "github" }, "original": { @@ -394,11 +394,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -465,11 +465,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1772402258, - "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=", + "lastModified": 1774309640, + "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=", "owner": "nix-community", "repo": "nixvim", - "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10", + "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554", "type": "github" }, "original": { @@ -486,11 +486,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774060240, - "narHash": "sha256-D71RQ9AHhosaqotzlPLURm0Dy0b301Tmqfo0IKLzskE=", + "lastModified": 1774318883, + "narHash": "sha256-7+Tyq7NCzk2tu65SsP98c7cPGxr+G0OvnYOZkh5/HIA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "b9a02cccc7b8388c3dedd0785812f31e02c8f26d", + "rev": "b725f32e27ffddac8c31022f78ad75ca56c079d4", "type": "github" }, "original": { @@ -509,11 +509,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773842483, - "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", + "lastModified": 1774304440, + "narHash": "sha256-JVLdoEuZUxS6Iujt0rC+Pyxw1pP6JSddGexqD6+yZ64=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", + "rev": "2ddc0266025b9cc196fc28a46f0ed89146834c4c", "type": "github" }, "original": { @@ -557,11 +557,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1773970322, - "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=", + "lastModified": 1774302228, + "narHash": "sha256-uGe/9XdfviGQbidgmk6Uu0vu2Ly5nqmtYzUqGU5ejDc=", "owner": "notashelf", "repo": "nvf", - "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec", + "rev": "84fbbc801ff1a7a9747bff71688ad376b83b2f7b", "type": "github" }, "original": { @@ -620,11 +620,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1773792048, - "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", + "lastModified": 1774124764, + "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", "owner": "danth", "repo": "stylix", - "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", + "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", "type": "github" }, "original": { From 34ab1c370e3723ee39efbe2d282bdeec8d5b4692 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 24 Mar 2026 00:52:57 -0400 Subject: [PATCH 177/232] Fixed nvim config error, set lualine theme --- modules/home/editors/nixvim.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 2b0203e..cc911c9 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -44,6 +44,9 @@ settings = { flavour = "mocha"; transparent_background = false; + integrations = { + lualine = true; + }; }; }; From 9bc46719d5a6a1465e47a16b2a130fe3ad512c2b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 24 Mar 2026 00:59:16 -0400 Subject: [PATCH 178/232] 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 --- CHANGELOG.md | 4 ++++ modules/home/cli/git.nix | 1 + modules/home/editors/nixvim.nix | 2 +- modules/home/gtk.nix | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d474662..d6218d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ # 🚀 **Current Release - ZaneyOS v2.6.1** +- 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 diff --git a/modules/home/cli/git.nix b/modules/home/cli/git.nix index 5a509ad..996b394 100644 --- a/modules/home/cli/git.nix +++ b/modules/home/cli/git.nix @@ -3,6 +3,7 @@ in { programs.git = { enable = true; + signing.format = null; settings = { user = { diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index cc911c9..21dd6dd 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -56,7 +56,7 @@ lualine = { enable = true; settings = { - options = {theme = "catppuccin";}; + options = {theme = "auto";}; }; }; bufferline.enable = true; diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix index cec72b3..12fe645 100644 --- a/modules/home/gtk.nix +++ b/modules/home/gtk.nix @@ -1,5 +1,6 @@ -{pkgs, ...}: { +{config, pkgs, ...}: { gtk = { + gtk4.theme = null; iconTheme = { name = "Papirus-Dark"; package = pkgs.papirus-icon-theme; From 89517a3996939be440c4ac8ca208445099dba95f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 24 Mar 2026 01:33:25 -0400 Subject: [PATCH 179/232] Updated flake, fixed lualine error in nixvim On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: CHANGELOG.md modified: flake.lock modified: modules/home/editors/nixvim.nix --- CHANGELOG.md | 7 ++++++ flake.lock | 42 ++++++++++++++++----------------- modules/home/editors/nixvim.nix | 2 +- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe21201..ba40ecc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ # 🚀 **Current Release - ZaneyOS v2.6.1** +#### 📅 **Updated: March 24th, 2026** + +- Fixed `nixvim` config error + - `lualine` theme set to auto +- Fixed evaluation warnings + + #### 📅 **Updated: March 16th, 2026** - Fixed issues with `qs-wallpaper,qs-wlogout` diff --git a/flake.lock b/flake.lock index 4eefd35..f808314 100644 --- a/flake.lock +++ b/flake.lock @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1774007980, - "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", + "lastModified": 1774293042, + "narHash": "sha256-OEBV+Y5I4Ldu98k0KvGXRfJYh+jjE8ocCSL/dxTGs1s=", "owner": "nix-community", "repo": "home-manager", - "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", + "rev": "bc357c75e3142a31b849ba49c5299fb52c61cf59", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -375,11 +375,11 @@ ] }, "locked": { - "lastModified": 1772402258, - "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=", + "lastModified": 1774309640, + "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=", "owner": "nix-community", "repo": "nixvim", - "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10", + "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554", "type": "github" }, "original": { @@ -396,11 +396,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774060240, - "narHash": "sha256-D71RQ9AHhosaqotzlPLURm0Dy0b301Tmqfo0IKLzskE=", + "lastModified": 1774318883, + "narHash": "sha256-7+Tyq7NCzk2tu65SsP98c7cPGxr+G0OvnYOZkh5/HIA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "b9a02cccc7b8388c3dedd0785812f31e02c8f26d", + "rev": "b725f32e27ffddac8c31022f78ad75ca56c079d4", "type": "github" }, "original": { @@ -419,11 +419,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773842483, - "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", + "lastModified": 1774304440, + "narHash": "sha256-JVLdoEuZUxS6Iujt0rC+Pyxw1pP6JSddGexqD6+yZ64=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", + "rev": "2ddc0266025b9cc196fc28a46f0ed89146834c4c", "type": "github" }, "original": { @@ -471,11 +471,11 @@ ] }, "locked": { - "lastModified": 1773970322, - "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=", + "lastModified": 1774302228, + "narHash": "sha256-uGe/9XdfviGQbidgmk6Uu0vu2Ly5nqmtYzUqGU5ejDc=", "owner": "notashelf", "repo": "nvf", - "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec", + "rev": "84fbbc801ff1a7a9747bff71688ad376b83b2f7b", "type": "github" }, "original": { @@ -521,11 +521,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1773792048, - "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", + "lastModified": 1774124764, + "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", "owner": "danth", "repo": "stylix", - "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", + "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", "type": "github" }, "original": { diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index cedafeb..6f0a4e5 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -53,7 +53,7 @@ lualine = { enable = true; settings = { - options = {theme = "catppuccin";}; + options = {theme = "auto";}; }; }; bufferline.enable = true; From 02a91373460f03557e0f859f845e838c5540af9a Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 24 Mar 2026 01:35:54 -0400 Subject: [PATCH 180/232] Fixed gtk.gtk4 theme and git eval warnings On branch zos-next Your branch is up to date with 'origin/zos-next'. Changes to be committed: modified: CHANGELOG.md modified: modules/home/cli/git.nix modified: modules/home/gtk.nix --- CHANGELOG.md | 9 +++++---- modules/home/cli/git.nix | 1 + modules/home/gtk.nix | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba40ecc..4431c31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,11 @@ #### 📅 **Updated: March 24th, 2026** -- Fixed `nixvim` config error - - `lualine` theme set to auto -- Fixed evaluation warnings - +- 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** diff --git a/modules/home/cli/git.nix b/modules/home/cli/git.nix index b5e41ee..9bef8f4 100644 --- a/modules/home/cli/git.nix +++ b/modules/home/cli/git.nix @@ -3,6 +3,7 @@ in { programs.git = { enable = true; + signing.format = null; settings = { user = { diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix index cec72b3..12fe645 100644 --- a/modules/home/gtk.nix +++ b/modules/home/gtk.nix @@ -1,5 +1,6 @@ -{pkgs, ...}: { +{config, pkgs, ...}: { gtk = { + gtk4.theme = null; iconTheme = { name = "Papirus-Dark"; package = pkgs.papirus-icon-theme; From 27ba6b39350271a85cfe6f0f5f6f0273682315d8 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Tue, 24 Mar 2026 14:14:39 -0400 Subject: [PATCH 181/232] Updated flake to check reported issue --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6fb8e06..f5261a6 100644 --- a/flake.lock +++ b/flake.lock @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1774293042, - "narHash": "sha256-OEBV+Y5I4Ldu98k0KvGXRfJYh+jjE8ocCSL/dxTGs1s=", + "lastModified": 1774371786, + "narHash": "sha256-ag1HUJv0SDBqKAYxwWlvAE2gBsEk3XYFvWtmdAHFz7E=", "owner": "nix-community", "repo": "home-manager", - "rev": "bc357c75e3142a31b849ba49c5299fb52c61cf59", + "rev": "b8cb89f2c4f7006b17b4aa5d8b39b95b93b559d8", "type": "github" }, "original": { @@ -486,11 +486,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774318883, - "narHash": "sha256-7+Tyq7NCzk2tu65SsP98c7cPGxr+G0OvnYOZkh5/HIA=", + "lastModified": 1774374378, + "narHash": "sha256-topcCacFpMQeu/TlKBgQwGtA61JU2MzvzwVisu42g0M=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "b725f32e27ffddac8c31022f78ad75ca56c079d4", + "rev": "d1c0374f73ea687ae33b30fe6c4257dc0995d4f3", "type": "github" }, "original": { @@ -557,11 +557,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1774302228, - "narHash": "sha256-uGe/9XdfviGQbidgmk6Uu0vu2Ly5nqmtYzUqGU5ejDc=", + "lastModified": 1774375131, + "narHash": "sha256-d22VIgsDXagQQWnAnebYeQWGHlmF81YRwuGCzAgNZAQ=", "owner": "notashelf", "repo": "nvf", - "rev": "84fbbc801ff1a7a9747bff71688ad376b83b2f7b", + "rev": "d847d401bea4dcb1478d02a61a3209fa8512f71d", "type": "github" }, "original": { From 4f7e54a2184dd30696dcd405cc7f30595841c919 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 3 Apr 2026 14:00:55 -0400 Subject: [PATCH 182/232] 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 --- FAQ.es.md | 6 +-- FAQ.md | 12 +++--- modules/home/hyprland/exec-once.nix | 4 +- modules/home/hyprland/hyprland.nix | 2 +- modules/home/scripts/keybinds-parser.nix | 2 +- .../home/scripts/qs-vid-wallpapers-apply.nix | 4 +- modules/home/scripts/qs-wallpapers-apply.nix | 38 +++++++++---------- .../home/scripts/qs-wallpapers-restore.nix | 36 +++++++++--------- modules/home/scripts/wallsetter.nix | 2 +- 9 files changed, 53 insertions(+), 53 deletions(-) diff --git a/FAQ.es.md b/FAQ.es.md index 7b9bcbc..5a08953 100644 --- a/FAQ.es.md +++ b/FAQ.es.md @@ -825,7 +825,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; ** ¿Cómo puedo establecer un temporizador para cambiar el wallpaper automáticamente? ** 1. Edita el archivo `~/zaneyos/modules/home/hyprland/config.nix` file. -2. Comenta la línea `sleep 1.5 && swww img ...` +2. Comenta la línea `sleep 1.5 && awww img ...` 3. Agrega nueva línea después de eso con `sleep 1 && wallsetter` ```json @@ -833,13 +833,13 @@ settings = { exec-once = [ "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "killall -q swww;sleep .5 && swww init" + "killall -q awww;sleep .5 && awww init" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" "pypr &" - #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" + #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; ``` diff --git a/FAQ.md b/FAQ.md index 1c1b2ab..32c6708 100644 --- a/FAQ.md +++ b/FAQ.md @@ -811,7 +811,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; ** How can I set a timer to change the wallpaper automatically? ** 1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file. -2. Comment out the line `sleep 1.5 && swww img ...` +2. Comment out the line `sleep 1.5 && awww img ...` 3. Add new line after that with `sleep 1 && wallsetter` ```json @@ -819,13 +819,13 @@ settings = { exec-once = [ "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "killall -q swww;sleep .5 && swww init" + "killall -q awww;sleep .5 && awww init" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" "pypr &" - #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" + #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; ``` @@ -2002,7 +2002,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; ** How can I set a timer to change the wallpaper automatically? ** 1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file. -2. Comment out the line `sleep 1.5 && swww img ...` +2. Comment out the line `sleep 1.5 && awww img ...` 3. Add new line after that with `sleep 1 && wallsetter` ```json @@ -2010,13 +2010,13 @@ settings = { exec-once = [ "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "killall -q swww;sleep .5 && swww init" + "killall -q awww;sleep .5 && awww init" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" "pypr &" - #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" + #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; ``` diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index 130233a..edb5f50 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -20,12 +20,12 @@ waybarExec = if barChoice != "noctalia" then [ - "killall -q swww;sleep .5 && swww-daemon" + "killall -q awww;sleep .5 && awww-daemon" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" # Delayed-only restore so Stylix finishes first, then user's wallpaper wins with a single change - "sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend swww) >/dev/null 2>&1 || true'" + "sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend awww) >/dev/null 2>&1 || true'" ] else []; in { diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 367e28a..ce8b937 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -44,7 +44,7 @@ hyprKbVariant = variantFinal; in { home.packages = with pkgs; [ - swww + awww grim slurp wl-clipboard diff --git a/modules/home/scripts/keybinds-parser.nix b/modules/home/scripts/keybinds-parser.nix index 5451e94..0d2ef32 100644 --- a/modules/home/scripts/keybinds-parser.nix +++ b/modules/home/scripts/keybinds-parser.nix @@ -271,7 +271,7 @@ pkgs.writeShellScriptBin "keybinds-parser" '' else if (low ~ /(emacs|code|vscode|nvim|vim)/) category="editor" else if (low ~ /(rofi|wofi|dmenu|launcher)/) category="launcher" else if (low ~ /(chrome|chromium|firefox|brave|browser)/) category="browser" - else if (low ~ /(swww|wallpaper)/) category="wallpaper" + else if (low ~ /(awww|wallpaper)/) category="wallpaper" else if (low ~ /(playerctl|wpctl|pactl|pamixer|brightnessctl|volume|brightness)/) category="media" else category="app" } else { diff --git a/modules/home/scripts/qs-vid-wallpapers-apply.nix b/modules/home/scripts/qs-vid-wallpapers-apply.nix index c3f7dd8..61be824 100644 --- a/modules/home/scripts/qs-vid-wallpapers-apply.nix +++ b/modules/home/scripts/qs-vid-wallpapers-apply.nix @@ -67,8 +67,8 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" '' case "$BACKEND" in mpvpaper) - log "Stopping swww-daemon, hyprpaper, mpvpaper if running" - ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true + log "Stopping awww-daemon, hyprpaper, mpvpaper if running" + ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true log "Sleeping briefly before starting mpvpaper" diff --git a/modules/home/scripts/qs-wallpapers-apply.nix b/modules/home/scripts/qs-wallpapers-apply.nix index 1f9d77c..d256418 100644 --- a/modules/home/scripts/qs-wallpapers-apply.nix +++ b/modules/home/scripts/qs-wallpapers-apply.nix @@ -28,7 +28,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' # Auto-detect sensible default backend per compositor when not provided via env if [ -z "''${BACKEND:-}" ]; then if [ "''${XDG_SESSION_DESKTOP:-}" = "Niri" ] || [ "''${XDG_CURRENT_DESKTOP:-}" = "Niri" ] || command -v niri >/dev/null 2>&1; then - BACKEND="swww" + BACKEND="awww" else BACKEND="mpvpaper" fi @@ -96,8 +96,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' case "$BACKEND" in mpvpaper) # Stop other wallpaper daemons to avoid conflicts - log "Stopping swww-daemon, hyprpaper, mpvpaper if running" - ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true + log "Stopping awww-daemon, hyprpaper, mpvpaper if running" + ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true # Give the compositor a moment to release layers @@ -120,16 +120,16 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' exit 0 ;; - swww) + awww) ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true - # Start swww-daemon if needed (newer swww has no 'init' subcommand) - if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then - log "Starting swww-daemon" - ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true + # Start awww-daemon if needed (newer awww has no 'init' subcommand) + if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + log "Starting awww-daemon" + ${pkgs.awww}/bin/awww-daemon >/dev/null 2>&1 & disown || true # wait briefly for the daemon to be ready for i in $(${pkgs.coreutils}/bin/seq 1 50); do - if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then - log "swww-daemon ready" + if ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + log "awww-daemon ready" break fi ${pkgs.coreutils}/bin/sleep 0.1 @@ -139,26 +139,26 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true # Robust resize: if WALLPAPER_RESIZE is set, use it; otherwise try fill -> fit -> crop - run_swww_img() { + run_awww_img() { if [ -n "''${WALLPAPER_RESIZE:-}" ]; then - log "swww img --resize ''${WALLPAPER_RESIZE} $sel" - ${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$sel" + log "awww img --resize ''${WALLPAPER_RESIZE} $sel" + ${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel" return $? fi - log "Trying swww resize modes: fill -> fit -> crop" - ${pkgs.swww}/bin/swww img --resize fill "$sel" || \ - ${pkgs.swww}/bin/swww img --resize fit "$sel" || \ - ${pkgs.swww}/bin/swww img --resize crop "$sel" + log "Trying awww resize modes: fill -> fit -> crop" + ${pkgs.awww}/bin/awww img --resize fill "$sel" || \ + ${pkgs.awww}/bin/awww img --resize fit "$sel" || \ + ${pkgs.awww}/bin/awww img --resize crop "$sel" } # Niri: generic apply has proven to work more reliably than per-output here - run_swww_img + run_awww_img exit $? ;; hyprpaper) ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true - ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true + ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true # Generate a minimal hyprpaper config and start it _TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d) _CFG="$_TMPDIR/hyprpaper.conf" diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix index 9f0052f..9a4b10f 100644 --- a/modules/home/scripts/qs-wallpapers-restore.nix +++ b/modules/home/scripts/qs-wallpapers-restore.nix @@ -30,8 +30,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' hyprlock-update-wallpaper-link >/dev/null 2>&1 || true fi - # Order: recorded backend first, then swww -> hyprpaper -> mpvpaper -> waypaper - ORDER_DEFAULT="swww,hyprpaper,mpvpaper,waypaper" + # Order: recorded backend first, then awww -> hyprpaper -> mpvpaper -> waypaper + ORDER_DEFAULT="awww,hyprpaper,mpvpaper,waypaper" ORDER_COMBINED="$BACKEND_J,$ORDER_DEFAULT" # De-duplicate while preserving order (awk trick) ORDER=$({ echo "$ORDER_COMBINED" | ${pkgs.coreutils}/bin/tr ',' '\n' | ${pkgs.gawk}/bin/awk 'NF{ if (!seen[$0]++) print $0 }' | ${pkgs.coreutils}/bin/tr '\n' ','; echo; } | ${pkgs.coreutils}/bin/tr -s ',' | ${pkgs.gnused}/bin/sed 's/^,\|,$//g') @@ -50,35 +50,35 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' return 1 } - start_swww() { + start_awww() { - # Stop conflicting daemons if we intend to use swww + # Stop conflicting daemons if we intend to use awww ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true - if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then - log "Starting swww-daemon" - ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true + if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + log "Starting awww-daemon" + ${pkgs.awww}/bin/awww-daemon >/dev/null 2>&1 & disown || true for i in $(${pkgs.coreutils}/bin/seq 1 50); do - if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then break; fi + if ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then break; fi ${pkgs.coreutils}/bin/sleep 0.1 done fi # Robust resize: use explicit WALLPAPER_RESIZE if provided; otherwise try fill -> fit -> crop if [ -n "''${WALLPAPER_RESIZE:-}" ]; then - log "swww img --resize ''${WALLPAPER_RESIZE} $PATH_J" - ${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" + log "awww img --resize ''${WALLPAPER_RESIZE} $PATH_J" + ${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" else - log "Trying swww resize modes: fill -> fit -> crop" - ${pkgs.swww}/bin/swww img --resize fill "$PATH_J" || \ - ${pkgs.swww}/bin/swww img --resize fit "$PATH_J" || \ - ${pkgs.swww}/bin/swww img --resize crop "$PATH_J" + log "Trying awww resize modes: fill -> fit -> crop" + ${pkgs.awww}/bin/awww img --resize fill "$PATH_J" || \ + ${pkgs.awww}/bin/awww img --resize fit "$PATH_J" || \ + ${pkgs.awww}/bin/awww img --resize crop "$PATH_J" fi } start_hyprpaper() { ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true - ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true + ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true _TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d) _CFG="$_TMPDIR/hyprpaper.conf" { @@ -94,7 +94,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' } start_mpvpaper() { - ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true + ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true local MPV_OPTS="--no-audio --loop-file=inf --image-display-duration=inf --no-osc --no-osd-bar --keep-open=yes --keepaspect=yes --panscan=1.0" log "Starting mpvpaper" @@ -104,7 +104,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' start_waypaper() { if command -v waypaper >/dev/null 2>&1; then log "Trying waypaper" - waypaper --backend swww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1 + waypaper --backend awww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1 else return 1 fi @@ -113,7 +113,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' IFS=',' read -r -a tools <<<"$ORDER" for t in "''${tools[@]}"; do case "$t" in - swww) start_swww && exit 0 || log "swww failed; falling back" ;; + awww) start_awww && exit 0 || log "awww failed; falling back" ;; hyprpaper) start_hyprpaper && exit 0 || log "hyprpaper failed; falling back" ;; mpvpaper) start_mpvpaper && exit 0 || log "mpvpaper failed; falling back" ;; waypaper) start_waypaper && exit 0 || log "waypaper failed; falling back" ;; diff --git a/modules/home/scripts/wallsetter.nix b/modules/home/scripts/wallsetter.nix index a2ae7d5..c2371fe 100644 --- a/modules/home/scripts/wallsetter.nix +++ b/modules/home/scripts/wallsetter.nix @@ -17,7 +17,7 @@ pkgs.writeShellScriptBin "wallsetter" '' PREVIOUS=$WALLPAPER - ${pkgs.swww}/bin/swww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 + ${pkgs.awww}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 sleep $TIMEOUT done '' From fd663c28ca8d30aeb8a7aa3b3b85121566a7bb9e Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 3 Apr 2026 14:04:05 -0400 Subject: [PATCH 183/232] Updated CHANGELOG --- CHANGELOG.md | 6 +++ FAQ.es.md | 6 +-- FAQ.md | 12 +++--- modules/home/hyprland/exec-once.nix | 4 +- modules/home/hyprland/hyprland.nix | 2 +- modules/home/scripts/keybinds-parser.nix | 2 +- .../home/scripts/qs-vid-wallpapers-apply.nix | 4 +- modules/home/scripts/qs-wallpapers-apply.nix | 38 +++++++++---------- .../home/scripts/qs-wallpapers-restore.nix | 36 +++++++++--------- modules/home/scripts/wallsetter.nix | 2 +- 10 files changed, 59 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4431c31..1620408 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ # 🚀 **Current Release - ZaneyOS v2.6.1** +#### 📅 **Updated: April 3rd, 2026** + +- Swapped `awww` for `swww` + - `swww` is no longer maintained + - removed `--format xrgb` flag also no needed + #### 📅 **Updated: March 24th, 2026** - Fixed `nixvim` config error diff --git a/FAQ.es.md b/FAQ.es.md index d5f7079..8b6f029 100644 --- a/FAQ.es.md +++ b/FAQ.es.md @@ -827,7 +827,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; ** ¿Cómo puedo establecer un temporizador para cambiar el wallpaper automáticamente? ** 1. Edita el archivo `~/zaneyos/modules/home/hyprland/config.nix` file. -2. Comenta la línea `sleep 1.5 && swww img ...` +2. Comenta la línea `sleep 1.5 && awww img ...` 3. Agrega nueva línea después de eso con `sleep 1 && wallsetter` ```json @@ -835,13 +835,13 @@ settings = { exec-once = [ "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "killall -q swww;sleep .5 && swww init" + "killall -q awww;sleep .5 && awww init" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" "DropTerminal --spawn-only" - #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" + #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; ``` diff --git a/FAQ.md b/FAQ.md index 5721910..cd9fca1 100644 --- a/FAQ.md +++ b/FAQ.md @@ -813,7 +813,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; ** How can I set a timer to change the wallpaper automatically? ** 1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file. -2. Comment out the line `sleep 1.5 && swww img ...` +2. Comment out the line `sleep 1.5 && awww img ...` 3. Add new line after that with `sleep 1 && wallsetter` ```json @@ -821,13 +821,13 @@ settings = { exec-once = [ "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "killall -q swww;sleep .5 && swww init" + "killall -q awww;sleep .5 && awww init" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" "DropTerminal --spawn-only" - #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" + #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; ``` @@ -2004,7 +2004,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; ** How can I set a timer to change the wallpaper automatically? ** 1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file. -2. Comment out the line `sleep 1.5 && swww img ...` +2. Comment out the line `sleep 1.5 && awww img ...` 3. Add new line after that with `sleep 1 && wallsetter` ```json @@ -2012,13 +2012,13 @@ settings = { exec-once = [ "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "killall -q swww;sleep .5 && swww init" + "killall -q awww;sleep .5 && awww init" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" "DropTerminal --spawn-only" - #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" + #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; ``` diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index a0a6193..f4ff7df 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -15,12 +15,12 @@ waybarExec = if barChoice != "noctalia" then [ - "killall -q swww;sleep .5 && swww-daemon" + "killall -q awww;sleep .5 && awww-daemon" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" # Delayed-only restore so Stylix finishes first, then user's wallpaper wins with a single change - "sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend swww) >/dev/null 2>&1 || true'" + "sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend awww) >/dev/null 2>&1 || true'" ] else []; in { diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 89507db..84b599b 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -42,7 +42,7 @@ hyprKbVariant = variantFinal; in { home.packages = with pkgs; [ - swww + awww grim slurp wl-clipboard diff --git a/modules/home/scripts/keybinds-parser.nix b/modules/home/scripts/keybinds-parser.nix index 5451e94..0d2ef32 100644 --- a/modules/home/scripts/keybinds-parser.nix +++ b/modules/home/scripts/keybinds-parser.nix @@ -271,7 +271,7 @@ pkgs.writeShellScriptBin "keybinds-parser" '' else if (low ~ /(emacs|code|vscode|nvim|vim)/) category="editor" else if (low ~ /(rofi|wofi|dmenu|launcher)/) category="launcher" else if (low ~ /(chrome|chromium|firefox|brave|browser)/) category="browser" - else if (low ~ /(swww|wallpaper)/) category="wallpaper" + else if (low ~ /(awww|wallpaper)/) category="wallpaper" else if (low ~ /(playerctl|wpctl|pactl|pamixer|brightnessctl|volume|brightness)/) category="media" else category="app" } else { diff --git a/modules/home/scripts/qs-vid-wallpapers-apply.nix b/modules/home/scripts/qs-vid-wallpapers-apply.nix index c3f7dd8..61be824 100644 --- a/modules/home/scripts/qs-vid-wallpapers-apply.nix +++ b/modules/home/scripts/qs-vid-wallpapers-apply.nix @@ -67,8 +67,8 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" '' case "$BACKEND" in mpvpaper) - log "Stopping swww-daemon, hyprpaper, mpvpaper if running" - ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true + log "Stopping awww-daemon, hyprpaper, mpvpaper if running" + ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true log "Sleeping briefly before starting mpvpaper" diff --git a/modules/home/scripts/qs-wallpapers-apply.nix b/modules/home/scripts/qs-wallpapers-apply.nix index 1f9d77c..d256418 100644 --- a/modules/home/scripts/qs-wallpapers-apply.nix +++ b/modules/home/scripts/qs-wallpapers-apply.nix @@ -28,7 +28,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' # Auto-detect sensible default backend per compositor when not provided via env if [ -z "''${BACKEND:-}" ]; then if [ "''${XDG_SESSION_DESKTOP:-}" = "Niri" ] || [ "''${XDG_CURRENT_DESKTOP:-}" = "Niri" ] || command -v niri >/dev/null 2>&1; then - BACKEND="swww" + BACKEND="awww" else BACKEND="mpvpaper" fi @@ -96,8 +96,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' case "$BACKEND" in mpvpaper) # Stop other wallpaper daemons to avoid conflicts - log "Stopping swww-daemon, hyprpaper, mpvpaper if running" - ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true + log "Stopping awww-daemon, hyprpaper, mpvpaper if running" + ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true # Give the compositor a moment to release layers @@ -120,16 +120,16 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' exit 0 ;; - swww) + awww) ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true - # Start swww-daemon if needed (newer swww has no 'init' subcommand) - if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then - log "Starting swww-daemon" - ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true + # Start awww-daemon if needed (newer awww has no 'init' subcommand) + if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + log "Starting awww-daemon" + ${pkgs.awww}/bin/awww-daemon >/dev/null 2>&1 & disown || true # wait briefly for the daemon to be ready for i in $(${pkgs.coreutils}/bin/seq 1 50); do - if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then - log "swww-daemon ready" + if ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + log "awww-daemon ready" break fi ${pkgs.coreutils}/bin/sleep 0.1 @@ -139,26 +139,26 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true # Robust resize: if WALLPAPER_RESIZE is set, use it; otherwise try fill -> fit -> crop - run_swww_img() { + run_awww_img() { if [ -n "''${WALLPAPER_RESIZE:-}" ]; then - log "swww img --resize ''${WALLPAPER_RESIZE} $sel" - ${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$sel" + log "awww img --resize ''${WALLPAPER_RESIZE} $sel" + ${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel" return $? fi - log "Trying swww resize modes: fill -> fit -> crop" - ${pkgs.swww}/bin/swww img --resize fill "$sel" || \ - ${pkgs.swww}/bin/swww img --resize fit "$sel" || \ - ${pkgs.swww}/bin/swww img --resize crop "$sel" + log "Trying awww resize modes: fill -> fit -> crop" + ${pkgs.awww}/bin/awww img --resize fill "$sel" || \ + ${pkgs.awww}/bin/awww img --resize fit "$sel" || \ + ${pkgs.awww}/bin/awww img --resize crop "$sel" } # Niri: generic apply has proven to work more reliably than per-output here - run_swww_img + run_awww_img exit $? ;; hyprpaper) ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true - ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true + ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true # Generate a minimal hyprpaper config and start it _TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d) _CFG="$_TMPDIR/hyprpaper.conf" diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix index 9f0052f..9a4b10f 100644 --- a/modules/home/scripts/qs-wallpapers-restore.nix +++ b/modules/home/scripts/qs-wallpapers-restore.nix @@ -30,8 +30,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' hyprlock-update-wallpaper-link >/dev/null 2>&1 || true fi - # Order: recorded backend first, then swww -> hyprpaper -> mpvpaper -> waypaper - ORDER_DEFAULT="swww,hyprpaper,mpvpaper,waypaper" + # Order: recorded backend first, then awww -> hyprpaper -> mpvpaper -> waypaper + ORDER_DEFAULT="awww,hyprpaper,mpvpaper,waypaper" ORDER_COMBINED="$BACKEND_J,$ORDER_DEFAULT" # De-duplicate while preserving order (awk trick) ORDER=$({ echo "$ORDER_COMBINED" | ${pkgs.coreutils}/bin/tr ',' '\n' | ${pkgs.gawk}/bin/awk 'NF{ if (!seen[$0]++) print $0 }' | ${pkgs.coreutils}/bin/tr '\n' ','; echo; } | ${pkgs.coreutils}/bin/tr -s ',' | ${pkgs.gnused}/bin/sed 's/^,\|,$//g') @@ -50,35 +50,35 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' return 1 } - start_swww() { + start_awww() { - # Stop conflicting daemons if we intend to use swww + # Stop conflicting daemons if we intend to use awww ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true - if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then - log "Starting swww-daemon" - ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true + if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + log "Starting awww-daemon" + ${pkgs.awww}/bin/awww-daemon >/dev/null 2>&1 & disown || true for i in $(${pkgs.coreutils}/bin/seq 1 50); do - if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then break; fi + if ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then break; fi ${pkgs.coreutils}/bin/sleep 0.1 done fi # Robust resize: use explicit WALLPAPER_RESIZE if provided; otherwise try fill -> fit -> crop if [ -n "''${WALLPAPER_RESIZE:-}" ]; then - log "swww img --resize ''${WALLPAPER_RESIZE} $PATH_J" - ${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" + log "awww img --resize ''${WALLPAPER_RESIZE} $PATH_J" + ${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" else - log "Trying swww resize modes: fill -> fit -> crop" - ${pkgs.swww}/bin/swww img --resize fill "$PATH_J" || \ - ${pkgs.swww}/bin/swww img --resize fit "$PATH_J" || \ - ${pkgs.swww}/bin/swww img --resize crop "$PATH_J" + log "Trying awww resize modes: fill -> fit -> crop" + ${pkgs.awww}/bin/awww img --resize fill "$PATH_J" || \ + ${pkgs.awww}/bin/awww img --resize fit "$PATH_J" || \ + ${pkgs.awww}/bin/awww img --resize crop "$PATH_J" fi } start_hyprpaper() { ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true - ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true + ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true _TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d) _CFG="$_TMPDIR/hyprpaper.conf" { @@ -94,7 +94,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' } start_mpvpaper() { - ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true + ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true local MPV_OPTS="--no-audio --loop-file=inf --image-display-duration=inf --no-osc --no-osd-bar --keep-open=yes --keepaspect=yes --panscan=1.0" log "Starting mpvpaper" @@ -104,7 +104,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' start_waypaper() { if command -v waypaper >/dev/null 2>&1; then log "Trying waypaper" - waypaper --backend swww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1 + waypaper --backend awww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1 else return 1 fi @@ -113,7 +113,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' IFS=',' read -r -a tools <<<"$ORDER" for t in "''${tools[@]}"; do case "$t" in - swww) start_swww && exit 0 || log "swww failed; falling back" ;; + awww) start_awww && exit 0 || log "awww failed; falling back" ;; hyprpaper) start_hyprpaper && exit 0 || log "hyprpaper failed; falling back" ;; mpvpaper) start_mpvpaper && exit 0 || log "mpvpaper failed; falling back" ;; waypaper) start_waypaper && exit 0 || log "waypaper failed; falling back" ;; diff --git a/modules/home/scripts/wallsetter.nix b/modules/home/scripts/wallsetter.nix index a2ae7d5..c2371fe 100644 --- a/modules/home/scripts/wallsetter.nix +++ b/modules/home/scripts/wallsetter.nix @@ -17,7 +17,7 @@ pkgs.writeShellScriptBin "wallsetter" '' PREVIOUS=$WALLPAPER - ${pkgs.swww}/bin/swww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 + ${pkgs.awww}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 sleep $TIMEOUT done '' From 10f3587c6af15995df132eaeaa165f8e4828472f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 3 Apr 2026 14:06:14 -0400 Subject: [PATCH 184/232] Updated CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6218d8..0ed1bd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,12 @@ # 🚀 **Current Release - ZaneyOS v2.6.0** +#### 📅 **Updated: April 3rd, 2026** + +- Swapped `awww` for `swww` + - `swww` is no longer maintained + - removed `--format xrgb` flag also no needed + #### 📅 **Updated: February 19th, 2026** - Fixed `zcli` GPU detection for newer AMD GPUs From 0bbcb7866d147ad2c125afa997d310b2b20216df Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:08:45 -0400 Subject: [PATCH 185/232] 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 --- CHANGELOG.md | 1 + flake.nix | 4 ++++ modules/core/packages.nix | 1 + modules/home/hyprland/hyprland.nix | 1 - 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ed1bd2..bfa50ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ # 🚀 **Current Release - ZaneyOS v2.6.1** +- Added `awww` as flake input for installs < 25.11 - Fixed eval warnings: - `gtk.gtk4.theme` set to `null` - `git.signing.format` set to `null` diff --git a/flake.nix b/flake.nix index e3a88f6..9ca5d5b 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,10 @@ url = "github:kamadorueda/alejandra"; inputs.nixpkgs.follows = "nixpkgs"; }; + awww = { + url = "git+https://codeberg.org/LGFae/awww"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 3b7d27d..5b2a570 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -40,6 +40,7 @@ in { nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; + inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww noctaliaPkgs ++ [ alejandra # nix formatter diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index ce8b937..ee38d41 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -44,7 +44,6 @@ hyprKbVariant = variantFinal; in { home.packages = with pkgs; [ - awww grim slurp wl-clipboard From d2c0128e01d9aace82a076b46c5de3109e53745b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:16:16 -0400 Subject: [PATCH 186/232] 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 --- modules/home/scripts/default.nix | 7 ++++--- modules/home/scripts/qs-wallpapers-apply.nix | 18 ++++++++++-------- modules/home/scripts/qs-wallpapers-restore.nix | 18 ++++++++++-------- modules/home/scripts/wallsetter.nix | 6 ++++-- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 6e99baa..4874006 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -1,6 +1,7 @@ { config, pkgs, + inputs, username, profile, ... @@ -19,7 +20,7 @@ (import ./task-waybar.nix {inherit pkgs;}) (import ./DropTerminal.nix {inherit pkgs;}) (import ./wallsetter.nix { - inherit pkgs; + inherit pkgs inputs; inherit username; }) (import ./web-search.nix {inherit pkgs;}) @@ -32,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 pkgs;}) - (import ./qs-wallpapers-restore.nix {inherit 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;}) diff --git a/modules/home/scripts/qs-wallpapers-apply.nix b/modules/home/scripts/qs-wallpapers-apply.nix index d256418..2bc1818 100644 --- a/modules/home/scripts/qs-wallpapers-apply.nix +++ b/modules/home/scripts/qs-wallpapers-apply.nix @@ -1,4 +1,6 @@ -{pkgs}: +{pkgs, inputs}: let + awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww; +in pkgs.writeShellScriptBin "qs-wallpapers-apply" '' #!/usr/bin/env bash set -euo pipefail @@ -123,12 +125,12 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' awww) ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true # Start awww-daemon if needed (newer awww has no 'init' subcommand) - if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then log "Starting awww-daemon" - ${pkgs.awww}/bin/awww-daemon >/dev/null 2>&1 & disown || true + ${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true # wait briefly for the daemon to be ready for i in $(${pkgs.coreutils}/bin/seq 1 50); do - if ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then log "awww-daemon ready" break fi @@ -142,13 +144,13 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' run_awww_img() { if [ -n "''${WALLPAPER_RESIZE:-}" ]; then log "awww img --resize ''${WALLPAPER_RESIZE} $sel" - ${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel" + ${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel" return $? fi log "Trying awww resize modes: fill -> fit -> crop" - ${pkgs.awww}/bin/awww img --resize fill "$sel" || \ - ${pkgs.awww}/bin/awww img --resize fit "$sel" || \ - ${pkgs.awww}/bin/awww img --resize crop "$sel" + ${awwwPkg}/bin/awww img --resize fill "$sel" || \ + ${awwwPkg}/bin/awww img --resize fit "$sel" || \ + ${awwwPkg}/bin/awww img --resize crop "$sel" } # Niri: generic apply has proven to work more reliably than per-output here diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix index 9a4b10f..81a3554 100644 --- a/modules/home/scripts/qs-wallpapers-restore.nix +++ b/modules/home/scripts/qs-wallpapers-restore.nix @@ -1,4 +1,6 @@ -{pkgs}: +{pkgs, inputs}: let + awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww; +in pkgs.writeShellScriptBin "qs-wallpapers-restore" '' #!/usr/bin/env bash set -euo pipefail @@ -56,23 +58,23 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true - if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then log "Starting awww-daemon" - ${pkgs.awww}/bin/awww-daemon >/dev/null 2>&1 & disown || true + ${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true for i in $(${pkgs.coreutils}/bin/seq 1 50); do - if ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then break; fi + if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then break; fi ${pkgs.coreutils}/bin/sleep 0.1 done fi # Robust resize: use explicit WALLPAPER_RESIZE if provided; otherwise try fill -> fit -> crop if [ -n "''${WALLPAPER_RESIZE:-}" ]; then log "awww img --resize ''${WALLPAPER_RESIZE} $PATH_J" - ${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" + ${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" else log "Trying awww resize modes: fill -> fit -> crop" - ${pkgs.awww}/bin/awww img --resize fill "$PATH_J" || \ - ${pkgs.awww}/bin/awww img --resize fit "$PATH_J" || \ - ${pkgs.awww}/bin/awww img --resize crop "$PATH_J" + ${awwwPkg}/bin/awww img --resize fill "$PATH_J" || \ + ${awwwPkg}/bin/awww img --resize fit "$PATH_J" || \ + ${awwwPkg}/bin/awww img --resize crop "$PATH_J" fi } diff --git a/modules/home/scripts/wallsetter.nix b/modules/home/scripts/wallsetter.nix index c2371fe..59c5226 100644 --- a/modules/home/scripts/wallsetter.nix +++ b/modules/home/scripts/wallsetter.nix @@ -1,4 +1,6 @@ -{pkgs, ...}: +{pkgs, inputs, ...}: let + awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww; +in pkgs.writeShellScriptBin "wallsetter" '' TIMEOUT=720 @@ -17,7 +19,7 @@ pkgs.writeShellScriptBin "wallsetter" '' PREVIOUS=$WALLPAPER - ${pkgs.awww}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 + ${awwwPkg}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 sleep $TIMEOUT done '' From 2e29f9fabcead3e202c1842aec5bbd086c1afad2 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:26:57 -0400 Subject: [PATCH 187/232] 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 --- modules/home/editors/nixvim.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 21dd6dd..8a6bb69 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -329,13 +329,13 @@ lazygit nil hyprls - nodePackages.typescript-language-server - nodePackages.typescript + typescript-language-server + typescript vscode-langservers-extracted pyright lua-language-server zls - #marksman + marksman multimarkdown clang-tools prettierd @@ -344,6 +344,8 @@ nixpkgs-fmt figlet toilet + bash-language-server + tailwindcss-language-server ]; # Diagnostic UI and notify background tweaks From 4f02995d0d3b2a10d752c28efcd7eb365e297222 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:29:39 -0400 Subject: [PATCH 188/232] 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 --- modules/core/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 5b2a570..b444ee6 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -1,4 +1,5 @@ { + inputs, pkgs, host, ... From 6b7acb7fa5bd6ae248be9d4b167ee8f50098844f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:33:00 -0400 Subject: [PATCH 189/232] Fixed syntax error On branch main Changes to be committed: modified: modules/core/packages.nix --- modules/core/packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/core/packages.nix b/modules/core/packages.nix index b444ee6..afc4846 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -41,8 +41,10 @@ in { nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; - inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww - noctaliaPkgs + [ + inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww + ] + ++ noctaliaPkgs ++ [ alejandra # nix formatter amfora # Fancy Terminal Browser For Gemini Protocol From e81ea5a023cff9df768f4cedbd79f15c131a3341 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:47:06 -0400 Subject: [PATCH 190/232] 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 --- install-zaneyos.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 3060e09..560dd4d 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -141,13 +141,13 @@ has_vm=false if lspci | grep -qi 'vga\|3d\|display'; then while read -r line; do - if echo "$line" | grep -qi 'nvidia'; then + if echo "$line" | grep -Eqi '\b(nvidia)\b'; then has_nvidia=true - elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then + elif echo "$line" | grep -Eqi '\b(amd|ati|advanced micro devices)\b'; then has_amd=true - elif echo "$line" | grep -qi 'intel'; then + elif echo "$line" | grep -Eqi '\b(intel)\b'; then has_intel=true - elif echo "$line" | grep -qi 'virtio\|vmware'; then + elif echo "$line" | grep -Eqi '\b(virtio|vmware)\b'; then has_vm=true fi done < <(lspci | grep -i 'vga\|3d\|display') From 400f8510dcb1068e1f58f9ce33293b61b6b088ec Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 06:11:20 -0400 Subject: [PATCH 191/232] 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 --- install-zaneyos.sh | 14 +++++++------- modules/home/scripts/zcli.nix | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 560dd4d..cbf8690 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -139,23 +139,23 @@ has_intel=false has_amd=false has_vm=false -if lspci | grep -qi 'vga\|3d\|display'; then +if lspci -nn | grep -qi 'vga\|3d\|display'; then while read -r line; do - if echo "$line" | grep -Eqi '\b(nvidia)\b'; then + if echo "$line" | grep -Eqi '\[10de\]'; then has_nvidia=true - elif echo "$line" | grep -Eqi '\b(amd|ati|advanced micro devices)\b'; then + elif echo "$line" | grep -Eqi '\[1002\]'; then has_amd=true - elif echo "$line" | grep -Eqi '\b(intel)\b'; then + elif echo "$line" | grep -Eqi '\[8086\]'; then has_intel=true - elif echo "$line" | grep -Eqi '\b(virtio|vmware)\b'; then + elif echo "$line" | grep -Eqi '\b(virtio|vmware|qxl|qemu|virtualbox|bochs|hyper-v|microsoft)\b'; then has_vm=true fi - done < <(lspci | grep -i 'vga\|3d\|display') + done < <(lspci -nn | grep -i 'vga\|3d\|display') if $has_vm; then DETECTED_PROFILE="vm" elif $has_nvidia && $has_amd; then - DETECTED_PROFILE="amd-nvidia-hybrid" + DETECTED_PROFILE="amd-hybrid" elif $has_nvidia && $has_intel; then DETECTED_PROFILE="nvidia-laptop" elif $has_nvidia; then diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 407238f..95a0c61 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -244,18 +244,18 @@ in fi if ${pkgs.pciutils}/bin/lspci &> /dev/null; then # Check if lspci is available - if ${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then + if ${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then while read -r line; do - if echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'nvidia'; then + if echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi '\[10de\]'; then has_nvidia=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd\|ati\|advanced micro devices'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi '\[1002\]'; then has_amd=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'intel'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi '\[8086\]'; then has_intel=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware\|qxl\|qemu\|virtualbox\|bochs\|hyper-v\|microsoft'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi 'virtio\|vmware\|qxl\|qemu\|virtualbox\|bochs\|hyper-v\|microsoft'; then has_vm=true fi - done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display') + done < <(${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display') if "$has_vm"; then detected_profile="vm" From ae761a2c2605b83da18766d15fd9adbe9a85a688 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 11:43:12 -0400 Subject: [PATCH 192/232] Removed nodePacakages.xxx not supported --- modules/home/editors/bugsvim.nix | 9 ++++----- modules/home/editors/nixvim.nix | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/home/editors/bugsvim.nix b/modules/home/editors/bugsvim.nix index dda25b1..3485c2e 100644 --- a/modules/home/editors/bugsvim.nix +++ b/modules/home/editors/bugsvim.nix @@ -19,12 +19,12 @@ in { # Language Servers lua-language-server pyright - nodePackages.typescript-language-server + typescript-language-server tailwindcss-language-server clang-tools - nodePackages.bash-language-server + bash-language-server rust-analyzer - nodePackages.vscode-langservers-extracted # html, css, json, eslint + vscode-langservers-extracted # html, css, json, eslint nil # Nix LSP hyprls stdenv.cc @@ -37,7 +37,7 @@ in { alejandra # Linters - nodePackages.eslint_d + eslint_d luajitPackages.luacheck cpplint @@ -47,7 +47,6 @@ in { tree-sitter git gnumake - ]; # Ensure writable config and clear HM symlink remnants during transitions diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 6f0a4e5..27cf7a1 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -302,8 +302,8 @@ lazygit nil hyprls - nodePackages.typescript-language-server - nodePackages.typescript + typescript-language-server + typescript vscode-langservers-extracted pyright lua-language-server From b24637898b181ecc72d9acea98dd62c209952bad Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 11:46:02 -0400 Subject: [PATCH 193/232] Added overlay to nvim 11.6 breaks snacks inline image --- modules/core/overlays.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index f2d25f9..7c66ed5 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -3,6 +3,22 @@ # Provide pkgs.google-antigravity via antigravity-nix overlay inputs.antigravity-nix.overlays.default + # Pin Neovim to 0.11.6 (zos-next) + (_final: prev: let + neovim-unwrapped-0_11_6 = prev.neovim-unwrapped.overrideAttrs (_old: { + version = "0.11.6"; + src = prev.fetchFromGitHub { + owner = "neovim"; + repo = "neovim"; + rev = "v0.11.6"; + hash = "sha256-GdfCaKNe/qPaUV2NJPXY+ATnQNWnyFTFnkOYDyLhTNg="; + }; + }); + in { + neovim-unwrapped = neovim-unwrapped-0_11_6; + neovim = prev.neovim.override {neovim-unwrapped = neovim-unwrapped-0_11_6;}; + }) + # Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk (_final: prev: { xfce = prev.xfce // { From 16e5cde4c643809a6f2cc80c11dc7ae6c37b081c Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 12:02:09 -0400 Subject: [PATCH 194/232] Changed awww to flake input --- flake.lock | 62 ++++++++++++++++++- flake.nix | 4 ++ modules/core/packages.nix | 6 +- modules/home/scripts/qs-wallpapers-apply.nix | 18 +++--- .../home/scripts/qs-wallpapers-restore.nix | 18 +++--- modules/home/scripts/wallsetter.nix | 6 +- 6 files changed, 94 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index f808314..91b5e7e 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,28 @@ "type": "github" } }, + "awww": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1774191766, + "narHash": "sha256-bvO+gfuUOVUiBEwAJ5A2RjpysPzCfyXD+DM8piOa1+4=", + "ref": "refs/heads/main", + "rev": "7a8fc2e646b97e5ae508a44d3449e3b41345d456", + "revCount": 1336, + "type": "git", + "url": "https://codeberg.org/LGFae/awww" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/LGFae/awww" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -106,6 +128,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1751685974, @@ -459,7 +497,7 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", @@ -487,6 +525,7 @@ "root": { "inputs": { "antigravity-nix": "antigravity-nix", + "awww": "awww", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", @@ -498,6 +537,27 @@ "zen-browser": "zen-browser" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "awww", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764038373, + "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", diff --git a/flake.nix b/flake.nix index b003920..a88b2e0 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,10 @@ url = "github:0xc000022070/zen-browser-flake/beta"; inputs.nixpkgs.follows = "nixpkgs"; }; + awww = { + url = "git+https://codeberg.org/LGFae/awww"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 9288d57..024dd03 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -1,4 +1,5 @@ { + inputs, pkgs, config, ... @@ -43,7 +44,10 @@ in { nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; - noctaliaPkgs + [ + inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww + ] + ++ noctaliaPkgs ++ [ alejandra # nix formatter amfora # Fancy Terminal Browser For Gemini Protocol diff --git a/modules/home/scripts/qs-wallpapers-apply.nix b/modules/home/scripts/qs-wallpapers-apply.nix index d256418..2bc1818 100644 --- a/modules/home/scripts/qs-wallpapers-apply.nix +++ b/modules/home/scripts/qs-wallpapers-apply.nix @@ -1,4 +1,6 @@ -{pkgs}: +{pkgs, inputs}: let + awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww; +in pkgs.writeShellScriptBin "qs-wallpapers-apply" '' #!/usr/bin/env bash set -euo pipefail @@ -123,12 +125,12 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' awww) ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true # Start awww-daemon if needed (newer awww has no 'init' subcommand) - if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then log "Starting awww-daemon" - ${pkgs.awww}/bin/awww-daemon >/dev/null 2>&1 & disown || true + ${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true # wait briefly for the daemon to be ready for i in $(${pkgs.coreutils}/bin/seq 1 50); do - if ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then log "awww-daemon ready" break fi @@ -142,13 +144,13 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' run_awww_img() { if [ -n "''${WALLPAPER_RESIZE:-}" ]; then log "awww img --resize ''${WALLPAPER_RESIZE} $sel" - ${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel" + ${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel" return $? fi log "Trying awww resize modes: fill -> fit -> crop" - ${pkgs.awww}/bin/awww img --resize fill "$sel" || \ - ${pkgs.awww}/bin/awww img --resize fit "$sel" || \ - ${pkgs.awww}/bin/awww img --resize crop "$sel" + ${awwwPkg}/bin/awww img --resize fill "$sel" || \ + ${awwwPkg}/bin/awww img --resize fit "$sel" || \ + ${awwwPkg}/bin/awww img --resize crop "$sel" } # Niri: generic apply has proven to work more reliably than per-output here diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix index 9a4b10f..81a3554 100644 --- a/modules/home/scripts/qs-wallpapers-restore.nix +++ b/modules/home/scripts/qs-wallpapers-restore.nix @@ -1,4 +1,6 @@ -{pkgs}: +{pkgs, inputs}: let + awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww; +in pkgs.writeShellScriptBin "qs-wallpapers-restore" '' #!/usr/bin/env bash set -euo pipefail @@ -56,23 +58,23 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true - if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then log "Starting awww-daemon" - ${pkgs.awww}/bin/awww-daemon >/dev/null 2>&1 & disown || true + ${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true for i in $(${pkgs.coreutils}/bin/seq 1 50); do - if ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then break; fi + if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then break; fi ${pkgs.coreutils}/bin/sleep 0.1 done fi # Robust resize: use explicit WALLPAPER_RESIZE if provided; otherwise try fill -> fit -> crop if [ -n "''${WALLPAPER_RESIZE:-}" ]; then log "awww img --resize ''${WALLPAPER_RESIZE} $PATH_J" - ${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" + ${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" else log "Trying awww resize modes: fill -> fit -> crop" - ${pkgs.awww}/bin/awww img --resize fill "$PATH_J" || \ - ${pkgs.awww}/bin/awww img --resize fit "$PATH_J" || \ - ${pkgs.awww}/bin/awww img --resize crop "$PATH_J" + ${awwwPkg}/bin/awww img --resize fill "$PATH_J" || \ + ${awwwPkg}/bin/awww img --resize fit "$PATH_J" || \ + ${awwwPkg}/bin/awww img --resize crop "$PATH_J" fi } diff --git a/modules/home/scripts/wallsetter.nix b/modules/home/scripts/wallsetter.nix index c2371fe..59c5226 100644 --- a/modules/home/scripts/wallsetter.nix +++ b/modules/home/scripts/wallsetter.nix @@ -1,4 +1,6 @@ -{pkgs, ...}: +{pkgs, inputs, ...}: let + awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww; +in pkgs.writeShellScriptBin "wallsetter" '' TIMEOUT=720 @@ -17,7 +19,7 @@ pkgs.writeShellScriptBin "wallsetter" '' PREVIOUS=$WALLPAPER - ${pkgs.awww}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 + ${awwwPkg}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 sleep $TIMEOUT done '' From dcc235c61b8ea4dda9817d838c6ae90e6ecbb8fb Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 12:05:11 -0400 Subject: [PATCH 195/232] Fixed anonymous lambda --- modules/home/scripts/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 6a3f6bc..04b55d4 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -1,5 +1,6 @@ { config, + inputs, pkgs, username, zaneyos, @@ -26,8 +27,7 @@ (import ./ff4.nix {inherit pkgs;}) (import ./ff5.nix {inherit pkgs;}) (import ./wallsetter.nix { - inherit pkgs; - inherit username; + inherit inputs pkgs username; }) (import ./web-search.nix {inherit pkgs;}) # Cheatsheets viewer + parser @@ -39,8 +39,8 @@ (import ./qs-vid-wallpapers-apply.nix {inherit pkgs;}) (import ./qs-vid-wallpapers-watchdog.nix {inherit pkgs;}) (import ./qs-wallpapers.nix {inherit pkgs;}) - (import ./qs-wallpapers-apply.nix {inherit pkgs;}) - (import ./qs-wallpapers-restore.nix {inherit pkgs;}) + (import ./qs-wallpapers-apply.nix {inherit inputs pkgs;}) + (import ./qs-wallpapers-restore.nix {inherit inputs pkgs;}) (import ./qs-wlogout.nix {inherit pkgs;}) (import ./qs-docs.nix {inherit pkgs;}) (import ./docs-parser.nix {inherit pkgs;}) From e9f38a2ccd07d229b204d141a98d70840bfc9aac Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 12:22:00 -0400 Subject: [PATCH 196/232] Updated flake and CHANGELOG --- CHANGELOG.md | 9 +++- flake.lock | 150 ++++++++++++++++++++------------------------------- 2 files changed, 66 insertions(+), 93 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1620408..b5a1f4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,18 @@ --- -# 🚀 **Current Release - ZaneyOS v2.6.1** +# 🚀 **Current Release - ZaneyOS v2.6.2** #### 📅 **Updated: April 3rd, 2026** +- Pinned `neovim` to v11.6 + - `neovim` v12.0 breaks inline image preview in `snacks` plugin + - This only effects `bugsvim` neovim config + - `nixvim` and `nvf` don't use `snacks` plugin - Swapped `awww` for `swww` - `swww` is no longer maintained - - removed `--format xrgb` flag also no needed + - removed `--format xrgb` flag also not needed + - Added flake for `awww` was getting error on 25.11 installs of ZOS #### 📅 **Updated: March 24th, 2026** diff --git a/flake.lock b/flake.lock index 91b5e7e..9ba4f3a 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1773854383, - "narHash": "sha256-ra8jcAG9WHDsGvqgumqK7Bq6DQqOrbYm18S+TMKaots=", + "lastModified": 1774942619, + "narHash": "sha256-AxUTNmWQA7+l+ArgLc8ZAHMEvGNf8Gdx+jVx0zOu66Q=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "54f7caf3dff6ae6131669e91203fb06f2f82db3a", + "rev": "638e265b165f9cca9bd827abb52a864de1001aaf", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1775176642, + "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "179704030c5286c729b5b0522037d1d51341022c", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -259,20 +259,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", "repo": "gnome-shell", - "type": "gitlab" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" } }, "home-manager": { @@ -282,11 +280,11 @@ ] }, "locked": { - "lastModified": 1774293042, - "narHash": "sha256-OEBV+Y5I4Ldu98k0KvGXRfJYh+jjE8ocCSL/dxTGs1s=", + "lastModified": 1775268934, + "narHash": "sha256-Sa5tW5kYPJornQEkFVD43F/0d4/WP+/GLTNktTFe2qU=", "owner": "nix-community", "repo": "home-manager", - "rev": "bc357c75e3142a31b849ba49c5299fb52c61cf59", + "rev": "9dc93220c1c9a410ef6277d6dc55c571d9e592d0", "type": "github" }, "original": { @@ -304,11 +302,11 @@ ] }, "locked": { - "lastModified": 1773422513, - "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", + "lastModified": 1774991950, + "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", + "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", "type": "github" }, "original": { @@ -372,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { @@ -386,22 +384,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -413,11 +395,11 @@ ] }, "locked": { - "lastModified": 1774309640, - "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=", + "lastModified": 1775307257, + "narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=", "owner": "nix-community", "repo": "nixvim", - "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554", + "rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff", "type": "github" }, "original": { @@ -434,11 +416,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774318883, - "narHash": "sha256-7+Tyq7NCzk2tu65SsP98c7cPGxr+G0OvnYOZkh5/HIA=", + "lastModified": 1775309721, + "narHash": "sha256-yZIMJhv1Jg2I1bsag/chncl4nb/5pkrEKVwpkOqJqpI=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "b725f32e27ffddac8c31022f78ad75ca56c079d4", + "rev": "819b2d33b04b2180b6ef19dab7f86af7d3603a52", "type": "github" }, "original": { @@ -457,11 +439,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774304440, - "narHash": "sha256-JVLdoEuZUxS6Iujt0rC+Pyxw1pP6JSddGexqD6+yZ64=", + "lastModified": 1775135550, + "narHash": "sha256-79JP2QTdvp1jg7HGxAW+xzhzhLnlKUi8yGXq9nDCeH0=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "2ddc0266025b9cc196fc28a46f0ed89146834c4c", + "rev": "e7224b756dcd10eec040df818a4c7a0fda5d6eff", "type": "github" }, "original": { @@ -482,11 +464,11 @@ ] }, "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", + "lastModified": 1775228139, + "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", "owner": "nix-community", "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", + "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", "type": "github" }, "original": { @@ -509,11 +491,11 @@ ] }, "locked": { - "lastModified": 1774302228, - "narHash": "sha256-uGe/9XdfviGQbidgmk6Uu0vu2Ly5nqmtYzUqGU5ejDc=", + "lastModified": 1775122065, + "narHash": "sha256-ZlowJNkQOhpsXDuWbHgB1xY6W8kyzYn9coK9nJsqqNg=", "owner": "notashelf", "repo": "nvf", - "rev": "84fbbc801ff1a7a9747bff71688ad376b83b2f7b", + "rev": "d3304af3d5771e8d5bac6ee9bbdbce56086d54f7", "type": "github" }, "original": { @@ -574,18 +556,17 @@ "systems": [ "systems" ], - "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1774124764, - "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", + "lastModified": 1775247334, + "narHash": "sha256-eVKt8wpQqg6Hq/UdHQkV1izXGloGQxdlE4SSk9/X27s=", "owner": "danth", "repo": "stylix", - "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", + "rev": "6d0502ef7447090abf8b00362b5cda8ac64595b4", "type": "github" }, "original": { @@ -640,23 +621,6 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -676,11 +640,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", + "lastModified": 1772661346, + "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", + "rev": "13b5b0c299982bb361039601e2d72587d6846294", "type": "github" }, "original": { @@ -692,11 +656,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1772934010, + "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", "type": "github" }, "original": { @@ -708,11 +672,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1772909925, + "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", "type": "github" }, "original": { @@ -723,14 +687,18 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "noctalia", + "noctalia-qs", + "nixpkgs" + ] }, "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "lastModified": 1773297127, + "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", "type": "github" }, "original": { @@ -747,11 +715,11 @@ ] }, "locked": { - "lastModified": 1773661718, - "narHash": "sha256-MYm1EKp/gbBi9wMEf7Lx0agIVnej/P61sg97EruWzrU=", + "lastModified": 1775237696, + "narHash": "sha256-gECGt/SbcrGQZjeIYKY6WQtyaoLucOoEV8bpJaDVsEQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3ac6ea223b32ff63c45e3577712df991a35aaf33", + "rev": "9968536e8ee4f715554dfc994b5399982bcec9e5", "type": "github" }, "original": { From 5689b4db97fcf04720c3a26f64a6bf5270e11b1f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 13:31:27 -0400 Subject: [PATCH 197/232] Improving GPU detection --- install-zaneyos.sh | 19 ++++++++++++++++++- modules/home/install-zaneyos.sh | 19 ++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 3144010..95d9253 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -149,6 +149,23 @@ 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 @@ -158,7 +175,7 @@ if lspci | grep -qi 'vga\|3d\|display'; then has_amd=true elif echo "$line" | grep -qi 'intel'; then has_intel=true - elif echo "$line" | grep -qi 'virtio\|vmware'; then + elif echo "$line" | grep -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then has_vm=true fi done < <(lspci | grep -i 'vga\|3d\|display') diff --git a/modules/home/install-zaneyos.sh b/modules/home/install-zaneyos.sh index 14066d3..95438dc 100755 --- a/modules/home/install-zaneyos.sh +++ b/modules/home/install-zaneyos.sh @@ -109,6 +109,23 @@ 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 @@ -118,7 +135,7 @@ if lspci | grep -qi 'vga\|3d\|display'; then has_amd=true elif echo "$line" | grep -qi 'intel'; then has_intel=true - elif echo "$line" | grep -qi 'virtio\|vmware'; then + elif echo "$line" | grep -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then has_vm=true fi done < <(lspci | grep -i 'vga\|3d\|display') From c9103d7edf997c161bd58bffdd3e03025307e633 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 14:26:51 -0400 Subject: [PATCH 198/232] Making more improvements to GPU detection --- install-zaneyos.sh | 12 ++++++++++-- modules/home/install-zaneyos.sh | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 95d9253..fc4934f 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -169,7 +169,15 @@ fi if lspci | grep -qi 'vga\|3d\|display'; then while read -r line; do - if echo "$line" | grep -qi 'nvidia'; then + if echo "$line" | grep -Eq '\[10de:'; then + has_nvidia=true + elif echo "$line" | grep -Eq '\[1002:'; then + has_amd=true + elif echo "$line" | grep -Eq '\[8086:'; then + has_intel=true + elif echo "$line" | grep -Eq '\[(1af4|15ad|80ee|1b36|1414|1234|1013):'; then + has_vm=true + elif echo "$line" | grep -qi 'nvidia'; then has_nvidia=true elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then has_amd=true @@ -178,7 +186,7 @@ if lspci | grep -qi 'vga\|3d\|display'; then elif echo "$line" | grep -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then has_vm=true fi - done < <(lspci | grep -i 'vga\|3d\|display') + done < <(lspci -nn | grep -i 'vga\|3d\|display') if $has_vm; then DETECTED_PROFILE="vm" diff --git a/modules/home/install-zaneyos.sh b/modules/home/install-zaneyos.sh index 95438dc..0d0dd04 100755 --- a/modules/home/install-zaneyos.sh +++ b/modules/home/install-zaneyos.sh @@ -129,7 +129,15 @@ fi if lspci | grep -qi 'vga\|3d\|display'; then while read -r line; do - if echo "$line" | grep -qi 'nvidia'; then + if echo "$line" | grep -Eq '\[10de:'; then + has_nvidia=true + elif echo "$line" | grep -Eq '\[1002:'; then + has_amd=true + elif echo "$line" | grep -Eq '\[8086:'; then + has_intel=true + elif echo "$line" | grep -Eq '\[(1af4|15ad|80ee|1b36|1414|1234|1013):'; then + has_vm=true + elif echo "$line" | grep -qi 'nvidia'; then has_nvidia=true elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then has_amd=true @@ -138,7 +146,7 @@ if lspci | grep -qi 'vga\|3d\|display'; then elif echo "$line" | grep -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then has_vm=true fi - done < <(lspci | grep -i 'vga\|3d\|display') + done < <(lspci -nn | grep -i 'vga\|3d\|display') if $has_vm; then DETECTED_PROFILE="vm" From 2b69ea7fd76d7c3a44a7c88c8b96696de1e3200c Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 5 Apr 2026 13:37:35 -0400 Subject: [PATCH 199/232] Added grub and BTRFS mirrored boot drives Currently the mirrored option only works with the config that matches the ddubs nix-iso project layout On branch zos-next-grub Changes to be committed: modified: CHANGELOG.md modified: hosts/default/variables.nix modified: modules/core/boot.nix modified: modules/home/install-zaneyos.sh modified: modules/options.nix --- CHANGELOG.md | 7 +++ hosts/default/variables.nix | 7 +++ modules/core/boot.nix | 12 ++++-- modules/home/install-zaneyos.sh | 76 +++++++++++++++++++++++++++++++++ modules/options.nix | 24 +++++++++++ 5 files changed, 123 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5a1f4c..72a0e93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ # 🚀 **Current Release - ZaneyOS v2.6.2** +#### 📅 **Updated: April 5th, 2026** + +- Added support for grub + - Supports single drive w/grub + - Supports BTRFS mirrored boot drives + - Currenly only supporting ddubs `nix-iso` BTRFS mirror cfg + #### 📅 **Updated: April 3rd, 2026** - Pinned `neovim` to v11.6 diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index 69fe423..7ab6a05 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -82,6 +82,13 @@ _: { 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" ]; } + # ]; + # Themes, waybar and animation. # Set Stylix Image # This will set your color palette diff --git a/modules/core/boot.nix b/modules/core/boot.nix index 9579de8..733fe0d 100644 --- a/modules/core/boot.nix +++ b/modules/core/boot.nix @@ -4,6 +4,7 @@ ... }: let inherit (pkgs.stdenv.hostPlatform) isx86_64 isAarch64; + cfg = config.zaneyos; in { boot = { kernelPackages = @@ -16,14 +17,19 @@ in { kernel.sysctl = {"vm.max_map_count" = 2147483642;}; loader = { - grub.enable = false; - systemd-boot.enable = isx86_64; + 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; + generic-extlinux-compatible.enable = isAarch64 && cfg.bootLoader != "grub"; }; # Appimage Support diff --git a/modules/home/install-zaneyos.sh b/modules/home/install-zaneyos.sh index 0d0dd04..98c0589 100755 --- a/modules/home/install-zaneyos.sh +++ b/modules/home/install-zaneyos.sh @@ -244,6 +244,82 @@ 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 || $grub_in_current; then + vars_file="./hosts/$hostName/variables.nix" + sed -i '/^[[:space:]]*bootLoader[[:space:]]*=/d' "$vars_file" + sed -i '/^[[:space:]]*grubMirroredBoots[[:space:]]*=/,/^[[:space:]]*];/d' "$vars_file" + + if $mirror_boot && [ -n "$boot_device" ] && [ -n "$boot2_device" ]; then + awk -v boot_device="$boot_device" -v boot2_device="$boot2_device" ' + /^[[:space:]]*zaneyos[[:space:]]*=[[:space:]]*{/ && !done { + print; + print " bootLoader = \"grub\";"; + print " grubMirroredBoots = ["; + print " { path = \"/boot\"; devices = [ \"" boot_device "\" ]; }"; + print " { path = \"/boot2\"; devices = [ \"" boot2_device "\" ]; }"; + print " ];"; + done=1; + next + } + {print} + ' "$vars_file" > "$vars_file.tmp" && mv "$vars_file.tmp" "$vars_file" + echo -e "${GREEN}Detected mirrored /boot and /boot2; configuring GRUB with mirroredBoots.${NC}" + else + awk -v boot_device="$boot_device" ' + /^[[:space:]]*zaneyos[[:space:]]*=[[:space:]]*{/ && !done { + print; + print " bootLoader = \"grub\";"; + if (boot_device != "") { + print " grubMirroredBoots = ["; + print " { path = \"/boot\"; devices = [ \"" boot_device "\" ]; }"; + print " ];"; + } + done=1; + next + } + {print} + ' "$vars_file" > "$vars_file.tmp" && mv "$vars_file.tmp" "$vars_file" + if $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 + 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" diff --git a/modules/options.nix b/modules/options.nix index 59d67fb..32bd8fe 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -167,6 +167,30 @@ with lib; { description = "Console key map."; }; + # Bootloader selection + bootLoader = mkOption { + type = types.enum ["systemd-boot" "grub"]; + default = "systemd-boot"; + description = "Bootloader to use (systemd-boot or GRUB)."; + }; + + grubMirroredBoots = mkOption { + type = types.listOf (types.submodule { + options = { + path = mkOption { + type = types.str; + description = "Mount path for the EFI system partition."; + }; + devices = mkOption { + type = types.listOf types.str; + description = "Devices to install GRUB to for this EFI mount."; + }; + }; + }); + default = []; + description = "GRUB mirroredBoots entries for multi-ESP setups."; + }; + # For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA) intelID = mkOption { type = types.str; From 3b4f0e112830696eade16af77c9e20552c6532aa Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 5 Apr 2026 13:43:08 -0400 Subject: [PATCH 200/232] Set branch to zos-next-grub --- install-zaneyos.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index fc4934f..87a2041 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -242,7 +242,7 @@ if [ -d "$HOME/zaneyos" ]; then fi print_header "Cloning ZaneyOS Repository" -git clone https://gitlab.com/zaney/zaneyos.git -b zos-next --depth=1 ~/zaneyos +git clone https://gitlab.com/zaney/zaneyos.git -b zos-next-grub --depth=1 ~/zaneyos cd ~/zaneyos || exit 1 print_header "Git Configuration" @@ -391,15 +391,15 @@ awk -v h="$hostName" ' in_hosts=0 } { print } -' ./flake.nix > ./flake.nix.tmp && mv ./flake.nix.tmp ./flake.nix +' ./flake.nix >./flake.nix.tmp && mv ./flake.nix.tmp ./flake.nix # (quiet) flake updated # Update timezone in system.nix (robust quoting via Python helper) cp ./modules/core/system.nix ./modules/core/system.nix.bak python3 ./scripts/update_timezone.py ./modules/core/system.nix "$timezone" || { - print_error "Failed to update time.timeZone in modules/core/system.nix"; - exit 1; + print_error "Failed to update time.timeZone in modules/core/system.nix" + exit 1 } rm ./modules/core/system.nix.bak @@ -407,9 +407,9 @@ rm ./modules/core/system.nix.bak 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; + print_error "Failed to update hosts/$hostName/variables.nix" + echo "Check the file exists and the script at ./scripts/update_vars.py is present." + exit 1 } rm ./hosts/$hostName/variables.nix.bak From 18c76fc6679ec5fac65442ca1c6e59d761820e37 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 5 Apr 2026 14:49:37 -0400 Subject: [PATCH 201/232] Fixed boot mirror install issues SDDM wouldn't start, and added python3 are required pkg so install-zaneyos script works with mirrored boot drives On branch zos-next-grub Your branch is up to date with 'origin/zos-next-grub'. Changes to be committed: modified: packages.nix modified: ../home/install-zaneyos.sh --- modules/core/packages.nix | 2 +- modules/home/install-zaneyos.sh | 76 ++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 024dd03..4cbf7ce 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -18,7 +18,6 @@ power-profiles-daemon # needed for noctalia-shell power cycle ] else []; - in { programs = { neovim = { @@ -94,6 +93,7 @@ in { picard # For Changing Music Metadata & Getting Cover Art pkg-config # Wrapper Script For Allowing Packages To Get Info On Others playerctl # Allows Changing Media Volume Through Scripts + python3 # needeed for boot mirror install rhythmbox # audio player ripgrep # Improved Grep socat # Needed For Screenshots diff --git a/modules/home/install-zaneyos.sh b/modules/home/install-zaneyos.sh index 98c0589..a4fc048 100755 --- a/modules/home/install-zaneyos.sh +++ b/modules/home/install-zaneyos.sh @@ -277,44 +277,50 @@ boot2_device=$(get_device_for_mount "/boot2") if $mirror_boot || $grub_in_current; then vars_file="./hosts/$hostName/variables.nix" - sed -i '/^[[:space:]]*bootLoader[[:space:]]*=/d' "$vars_file" - sed -i '/^[[:space:]]*grubMirroredBoots[[:space:]]*=/,/^[[:space:]]*];/d' "$vars_file" + python3 - < "$vars_file.tmp" && mv "$vars_file.tmp" "$vars_file" 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 - awk -v boot_device="$boot_device" ' - /^[[:space:]]*zaneyos[[:space:]]*=[[:space:]]*{/ && !done { - print; - print " bootLoader = \"grub\";"; - if (boot_device != "") { - print " grubMirroredBoots = ["; - print " { path = \"/boot\"; devices = [ \"" boot_device "\" ]; }"; - print " ];"; - } - done=1; - next - } - {print} - ' "$vars_file" > "$vars_file.tmp" && mv "$vars_file.tmp" "$vars_file" - if $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 + 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}" @@ -331,7 +337,7 @@ if [[ ! $REPLY =~ ^[Yy]$ ]]; then exit 1 fi -sudo nixos-rebuild boot --flake ~/zaneyos/#${profile} +sudo nixos-rebuild boot --flake ~/zaneyos/#${hostName} # Check the exit status of the last command (nixos-rebuild) if [ $? -eq 0 ]; then From 710ff2683abb2cee3f631b7f6750c89986249ec0 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 5 Apr 2026 15:16:17 -0400 Subject: [PATCH 202/232] Fixing issues with mirror drive boot --- modules/home/install-zaneyos.sh | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/modules/home/install-zaneyos.sh b/modules/home/install-zaneyos.sh index a4fc048..22a2e2b 100755 --- a/modules/home/install-zaneyos.sh +++ b/modules/home/install-zaneyos.sh @@ -213,6 +213,7 @@ cd "$REPO_DIR" || exit 1 print_header "Configuring Host and Profile" mkdir -p hosts/"$hostName" cp hosts/default/*.nix hosts/"$hostName" +git add "hosts/$hostName" installusername=$(echo $USER) git config --global user.name "$installusername" @@ -274,6 +275,50 @@ get_device_for_mount() { boot_device=$(get_device_for_mount "/boot") boot2_device=$(get_device_for_mount "/boot2") +if $mirror_boot; then + python3 - < 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 - < 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" From e12d75770ff891513d4de82a3bf631d1917e503e Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 5 Apr 2026 15:49:09 -0400 Subject: [PATCH 203/232] Added zos-nix-mirror host for testing mirror boot On branch zos-next-grub Your branch is up to date with 'origin/zos-next-grub'. Changes to be committed: new file: hosts/zos-nix-mirror/default.nix new file: hosts/zos-nix-mirror/hardware-configuration.nix new file: hosts/zos-nix-mirror/hardware.nix new file: hosts/zos-nix-mirror/host-packages.nix new file: hosts/zos-nix-mirror/variables.nix --- hosts/zos-nix-mirror/default.nix | 7 + .../zos-nix-mirror/hardware-configuration.nix | 63 +++++++ hosts/zos-nix-mirror/hardware.nix | 68 ++++++++ hosts/zos-nix-mirror/host-packages.nix | 4 + hosts/zos-nix-mirror/variables.nix | 154 ++++++++++++++++++ 5 files changed, 296 insertions(+) create mode 100644 hosts/zos-nix-mirror/default.nix create mode 100644 hosts/zos-nix-mirror/hardware-configuration.nix create mode 100644 hosts/zos-nix-mirror/hardware.nix create mode 100644 hosts/zos-nix-mirror/host-packages.nix create mode 100644 hosts/zos-nix-mirror/variables.nix diff --git a/hosts/zos-nix-mirror/default.nix b/hosts/zos-nix-mirror/default.nix new file mode 100644 index 0000000..bdd5f44 --- /dev/null +++ b/hosts/zos-nix-mirror/default.nix @@ -0,0 +1,7 @@ +{...}: { + imports = [ + ./hardware.nix + ./host-packages.nix + ./variables.nix + ]; +} diff --git a/hosts/zos-nix-mirror/hardware-configuration.nix b/hosts/zos-nix-mirror/hardware-configuration.nix new file mode 100644 index 0000000..905b081 --- /dev/null +++ b/hosts/zos-nix-mirror/hardware-configuration.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + # --- Btrfs Mirror (RAID1) Configuration --- + # Using UUID ensures the mirror mounts even if /dev/sda fails + fileSystems."/" = + { device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51"; + fsType = "btrfs"; + options = [ "subvol=@" "compress=zstd" ]; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51"; + fsType = "btrfs"; + options = [ "subvol=@home" "compress=zstd" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51"; + fsType = "btrfs"; + options = [ "subvol=@nix" "compress=zstd" "noatime" ]; + }; + + fileSystems."/.snapshots" = + { device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51"; + fsType = "btrfs"; + options = [ "subvol=@snapshots" "compress=zstd" ]; + }; + + # --- Mirrored EFI Partitions --- + # Added 'nofail' so the VM boots even if one virtual disk is missing + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/0C60-CCDC"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" "nofail" ]; + }; + + fileSystems."/boot2" = + { device = "/dev/disk/by-uuid/0C61-7F7C"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" "nofail" ]; + }; + + + fileSystems."/mnt/nas" = + { device = "192.168.40.11:/volume1/DiskStation54TB"; + fsType = "nfs"; + options = [ "rw" "bg" "tcp" "_netdev" ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/hosts/zos-nix-mirror/hardware.nix b/hosts/zos-nix-mirror/hardware.nix new file mode 100644 index 0000000..52ddd11 --- /dev/null +++ b/hosts/zos-nix-mirror/hardware.nix @@ -0,0 +1,68 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + # --- Btrfs Mirror (RAID1) Configuration --- + # Using UUID ensures the mirror mounts even if /dev/sda fails + fileSystems."/" = { + device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51"; + fsType = "btrfs"; + options = ["subvol=@" "compress=zstd"]; + }; + + fileSystems."/home" = { + device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51"; + fsType = "btrfs"; + options = ["subvol=@home" "compress=zstd"]; + }; + + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51"; + fsType = "btrfs"; + options = ["subvol=@nix" "compress=zstd" "noatime"]; + }; + + fileSystems."/.snapshots" = { + device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51"; + fsType = "btrfs"; + options = ["subvol=@snapshots" "compress=zstd"]; + }; + + # --- Mirrored EFI Partitions --- + # Added 'nofail' so the VM boots even if one virtual disk is missing + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/0C60-CCDC"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022" "nofail"]; + }; + + fileSystems."/boot2" = { + device = "/dev/disk/by-uuid/0C61-7F7C"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022" "nofail"]; + }; + + fileSystems."/mnt/nas" = { + device = "192.168.40.11:/volume1/DiskStation54TB"; + fsType = "nfs"; + options = ["rw" "bg" "tcp" "_netdev"]; + }; + + swapDevices = []; + + security.sudo.wheelNeedsPassword = false; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/hosts/zos-nix-mirror/host-packages.nix b/hosts/zos-nix-mirror/host-packages.nix new file mode 100644 index 0000000..33b6047 --- /dev/null +++ b/hosts/zos-nix-mirror/host-packages.nix @@ -0,0 +1,4 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + ]; +} diff --git a/hosts/zos-nix-mirror/variables.nix b/hosts/zos-nix-mirror/variables.nix new file mode 100644 index 0000000..479c063 --- /dev/null +++ b/hosts/zos-nix-mirror/variables.nix @@ -0,0 +1,154 @@ +_: { + # Welcome to your ZaneyOS configuration! + # This block is where you can customize your NixOS experience. + # + # For a comprehensive list of all available options, their descriptions, + # and default values, please refer to the following file: + # ../../modules/options.nix + # + # You can override any of those options here. Most settings are optional + # and can be removed to use the project defaults. + zaneyos = { + # Git Configuration + gitUsername = "Tyler Kelley"; + gitEmail = "tylerzanekelley@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 = false; + #To install: Enable here, zcli rebuild, then run zcli doom install + doomEmacsEnable = true; + # Neovim config: "nixvim" | "nvf" | "bugsvim" + 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 = "brave"; + + # Default applications for this host (written to ~/.config/mimeapps.list) + # Uncomment and adjust to set per-host defaults. + # mimeDefaultApps = { + # # PDFs + # "application/pdf" = ["okular.desktop"]; + # "application/x-pdf" = ["okular.desktop"]; + # # Web browser + # "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop + # "x-scheme-handler/https" = ["google-chrome.desktop"]; + # "text/html" = ["google-chrome.desktop"]; + # # Text files + # "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop + # # Images and video + # "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop + # "video/mp4" = ["mpv.desktop"]; # or vlc.desktop + # # Folders (file manager) + # "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop + # }; + + # Available Options: + # Kitty, ghostty, wezterm, aalacrity + # Note: kitty, wezterm, alacritty have to be enabled in `variables.nix` + # Setting it here does not enable it. Kitty is installed by default + terminal = "kitty"; # Set Default System Terminal + + 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"; + }; +} From 7ca10cff3af6261b2b21105aa6ed7dedcdcb546b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 5 Apr 2026 17:32:42 -0400 Subject: [PATCH 204/232] Added hyprshutdown --- modules/home/hyprland/hyprland.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 84b599b..56927fc 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -50,6 +50,7 @@ in { ydotool hyprpolkitagent hyprshot + hyprshutdown hyprpicker #hyprland-qtutils # needed for banners and ANR messages ]; From 605b66fbb49cbe02ee047c32dbfdbc41e3c0eb02 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 5 Apr 2026 17:33:55 -0400 Subject: [PATCH 205/232] Added hyprshutdown --- modules/home/hyprland/hyprland.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index ee38d41..e99709c 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -51,6 +51,7 @@ in { ydotool hyprpolkitagent hyprshot + hyprshutdown hyprpicker #hyprland-qtutils # needed for banners and ANR messages ]; From f95a583a96a0f1dcc2516cf03ffa7d2a5c9c365e Mon Sep 17 00:00:00 2001 From: dwilliams Date: Tue, 7 Apr 2026 19:59:31 -0400 Subject: [PATCH 206/232] 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 --- flake.lock | 236 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 132 insertions(+), 104 deletions(-) diff --git a/flake.lock b/flake.lock index f5261a6..d783d53 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1768155355, - "narHash": "sha256-s0TBsxvGjl3Z4O3McFlKKq5CKCjFLYd/WGaROb3VkX0=", + "lastModified": 1775260434, + "narHash": "sha256-Km+QqtLb3RiO0J3WG44rSffzuEaRW4YFOADgH4VEZaY=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "8f47c5e82ee8e6e8adcc1748be0056a1e349f7e8", + "rev": "633579fda5c8fb0c1e08779c568bad3cff915947", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1773854383, - "narHash": "sha256-ra8jcAG9WHDsGvqgumqK7Bq6DQqOrbYm18S+TMKaots=", + "lastModified": 1774942619, + "narHash": "sha256-AxUTNmWQA7+l+ArgLc8ZAHMEvGNf8Gdx+jVx0zOu66Q=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "54f7caf3dff6ae6131669e91203fb06f2f82db3a", + "rev": "638e265b165f9cca9bd827abb52a864de1001aaf", "type": "github" }, "original": { @@ -43,6 +43,28 @@ "type": "github" } }, + "awww": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1774191766, + "narHash": "sha256-bvO+gfuUOVUiBEwAJ5A2RjpysPzCfyXD+DM8piOa1+4=", + "ref": "refs/heads/main", + "rev": "7a8fc2e646b97e5ae508a44d3449e3b41345d456", + "revCount": 1336, + "type": "git", + "url": "https://codeberg.org/LGFae/awww" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/LGFae/awww" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -136,11 +158,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1775176642, + "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "179704030c5286c729b5b0522037d1d51341022c", "type": "github" }, "original": { @@ -150,6 +172,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1751685974, @@ -215,11 +253,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -281,20 +319,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", "repo": "gnome-shell", - "type": "gitlab" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" } }, "home-manager": { @@ -304,11 +340,11 @@ ] }, "locked": { - "lastModified": 1774371786, - "narHash": "sha256-ag1HUJv0SDBqKAYxwWlvAE2gBsEk3XYFvWtmdAHFz7E=", + "lastModified": 1775598298, + "narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "b8cb89f2c4f7006b17b4aa5d8b39b95b93b559d8", + "rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86", "type": "github" }, "original": { @@ -326,11 +362,11 @@ ] }, "locked": { - "lastModified": 1773422513, - "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", + "lastModified": 1774991950, + "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", + "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", "type": "github" }, "original": { @@ -394,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -410,27 +446,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -440,13 +460,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { @@ -465,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1774309640, - "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=", + "lastModified": 1775307257, + "narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=", "owner": "nix-community", "repo": "nixvim", - "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554", + "rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff", "type": "github" }, "original": { @@ -486,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774374378, - "narHash": "sha256-topcCacFpMQeu/TlKBgQwGtA61JU2MzvzwVisu42g0M=", + "lastModified": 1775593740, + "narHash": "sha256-P2bAFa/lx2wzMVVHwIbUOBXTpejzWsAMJACDtEdHXMU=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "d1c0374f73ea687ae33b30fe6c4257dc0995d4f3", + "rev": "48fe0f91a5fa514ca37863b2078b8c20a97fb66b", "type": "github" }, "original": { @@ -509,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774304440, - "narHash": "sha256-JVLdoEuZUxS6Iujt0rC+Pyxw1pP6JSddGexqD6+yZ64=", + "lastModified": 1775491791, + "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "2ddc0266025b9cc196fc28a46f0ed89146834c4c", + "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", "type": "github" }, "original": { @@ -534,11 +554,11 @@ ] }, "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", + "lastModified": 1775228139, + "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", "owner": "nix-community", "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", + "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", "type": "github" }, "original": { @@ -549,19 +569,19 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems_4" }, "locked": { - "lastModified": 1774375131, - "narHash": "sha256-d22VIgsDXagQQWnAnebYeQWGHlmF81YRwuGCzAgNZAQ=", + "lastModified": 1775567832, + "narHash": "sha256-jAnxLY0qPW+qR4f5GTLp2qbtku8b4E2XuJ8mavSIPfY=", "owner": "notashelf", "repo": "nvf", - "rev": "d847d401bea4dcb1478d02a61a3209fa8512f71d", + "rev": "d6746a7510ba15e9a3577322a2e5387ab983f970", "type": "github" }, "original": { @@ -574,6 +594,7 @@ "inputs": { "alejandra": "alejandra", "antigravity-nix": "antigravity-nix", + "awww": "awww", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", @@ -601,6 +622,27 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "awww", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764038373, + "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -610,21 +652,20 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nur": "nur", "systems": "systems_5", - "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1774124764, - "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", + "lastModified": 1775429060, + "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=", "owner": "danth", "repo": "stylix", - "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", + "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019", "type": "github" }, "original": { @@ -709,23 +750,6 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -745,11 +769,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", + "lastModified": 1772661346, + "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", + "rev": "13b5b0c299982bb361039601e2d72587d6846294", "type": "github" }, "original": { @@ -761,11 +785,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1772934010, + "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", "type": "github" }, "original": { @@ -777,11 +801,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1772909925, + "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", "type": "github" }, "original": { @@ -792,14 +816,18 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "noctalia", + "noctalia-qs", + "nixpkgs" + ] }, "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "lastModified": 1775125835, + "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "rev": "75925962939880974e3ab417879daffcba36c4a3", "type": "github" }, "original": { @@ -816,11 +844,11 @@ ] }, "locked": { - "lastModified": 1773661718, - "narHash": "sha256-MYm1EKp/gbBi9wMEf7Lx0agIVnej/P61sg97EruWzrU=", + "lastModified": 1775367672, + "narHash": "sha256-nGC6qrRsWysfR7/8wsSooq0X71rfJjhq1b+dFI6oQtY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3ac6ea223b32ff63c45e3577712df991a35aaf33", + "rev": "33cd729244914f1e121477c5de148639c5e73c4a", "type": "github" }, "original": { From 03d38b6991150742905776bbb4d2404c3d960aad Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 7 Apr 2026 20:03:22 -0400 Subject: [PATCH 207/232] Upd flake to fix NIX CVE On branch zos-next-grub Your branch is up to date with 'origin/zos-next-grub'. Changes to be committed: modified: flake.lock modified: flake.nix modified: hosts/zos-nix-mirror/variables.nix modified: modules/core/packages.nix --- flake.lock | 48 +++++++++++++++--------------- flake.nix | 1 + hosts/zos-nix-mirror/variables.nix | 12 ++++---- modules/core/packages.nix | 1 + 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 9ba4f3a..daf4ad7 100644 --- a/flake.lock +++ b/flake.lock @@ -280,11 +280,11 @@ ] }, "locked": { - "lastModified": 1775268934, - "narHash": "sha256-Sa5tW5kYPJornQEkFVD43F/0d4/WP+/GLTNktTFe2qU=", + "lastModified": 1775598298, + "narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "9dc93220c1c9a410ef6277d6dc55c571d9e592d0", + "rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -416,11 +416,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775309721, - "narHash": "sha256-yZIMJhv1Jg2I1bsag/chncl4nb/5pkrEKVwpkOqJqpI=", + "lastModified": 1775593740, + "narHash": "sha256-P2bAFa/lx2wzMVVHwIbUOBXTpejzWsAMJACDtEdHXMU=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "819b2d33b04b2180b6ef19dab7f86af7d3603a52", + "rev": "48fe0f91a5fa514ca37863b2078b8c20a97fb66b", "type": "github" }, "original": { @@ -439,11 +439,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775135550, - "narHash": "sha256-79JP2QTdvp1jg7HGxAW+xzhzhLnlKUi8yGXq9nDCeH0=", + "lastModified": 1775491791, + "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "e7224b756dcd10eec040df818a4c7a0fda5d6eff", + "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", "type": "github" }, "original": { @@ -491,11 +491,11 @@ ] }, "locked": { - "lastModified": 1775122065, - "narHash": "sha256-ZlowJNkQOhpsXDuWbHgB1xY6W8kyzYn9coK9nJsqqNg=", + "lastModified": 1775567832, + "narHash": "sha256-jAnxLY0qPW+qR4f5GTLp2qbtku8b4E2XuJ8mavSIPfY=", "owner": "notashelf", "repo": "nvf", - "rev": "d3304af3d5771e8d5bac6ee9bbdbce56086d54f7", + "rev": "d6746a7510ba15e9a3577322a2e5387ab983f970", "type": "github" }, "original": { @@ -562,11 +562,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1775247334, - "narHash": "sha256-eVKt8wpQqg6Hq/UdHQkV1izXGloGQxdlE4SSk9/X27s=", + "lastModified": 1775429060, + "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=", "owner": "danth", "repo": "stylix", - "rev": "6d0502ef7447090abf8b00362b5cda8ac64595b4", + "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019", "type": "github" }, "original": { @@ -694,11 +694,11 @@ ] }, "locked": { - "lastModified": 1773297127, - "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", + "lastModified": 1775125835, + "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", + "rev": "75925962939880974e3ab417879daffcba36c4a3", "type": "github" }, "original": { @@ -715,11 +715,11 @@ ] }, "locked": { - "lastModified": 1775237696, - "narHash": "sha256-gECGt/SbcrGQZjeIYKY6WQtyaoLucOoEV8bpJaDVsEQ=", + "lastModified": 1775367672, + "narHash": "sha256-nGC6qrRsWysfR7/8wsSooq0X71rfJjhq1b+dFI6oQtY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9968536e8ee4f715554dfc994b5399982bcec9e5", + "rev": "33cd729244914f1e121477c5de148639c5e73c4a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a88b2e0..7083cf3 100644 --- a/flake.nix +++ b/flake.nix @@ -76,6 +76,7 @@ }; hosts = [ + "zos-nix-mirror" "zaneyos-next" "default" "zaneyos-24-vm" diff --git a/hosts/zos-nix-mirror/variables.nix b/hosts/zos-nix-mirror/variables.nix index 479c063..607145f 100644 --- a/hosts/zos-nix-mirror/variables.nix +++ b/hosts/zos-nix-mirror/variables.nix @@ -10,8 +10,8 @@ _: { # and can be removed to use the project defaults. zaneyos = { # Git Configuration - gitUsername = "Tyler Kelley"; - gitEmail = "tylerzanekelley@gmail.com"; + gitUsername = "Don Williams"; + gitEmail = "don.e.williams@gmail.com"; # does not have to be the same as the directory name, but # would be common @@ -33,7 +33,7 @@ _: { vscodeEnable = true; antigravityEnable = true; # Google port of vscodium # Note: This is evil-helix with VIM keybindings by default - helixEnable = false; + helixEnable = true; #To install: Enable here, zcli rebuild, then run zcli doom install doomEmacsEnable = true; # Neovim config: "nixvim" | "nvf" | "bugsvim" @@ -51,7 +51,7 @@ _: { # This does NOT install your browser # You need to install it by adding it to the `packages.nix` # or as a flatpak - browser = "brave"; + browser = "google-chrome-stable"; # Default applications for this host (written to ~/.config/mimeapps.list) # Uncomment and adjust to set per-host defaults. @@ -135,12 +135,12 @@ _: { # 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.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-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; diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 4cbf7ce..ea6d858 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -51,6 +51,7 @@ 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 From b797cac7007e11c14d4deb822d103d71f756c248 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 9 Apr 2026 18:41:13 -0400 Subject: [PATCH 208/232] 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 --- install-zaneyos.sh | 37 +++++++++++++++++++++++++++++------ modules/home/scripts/zcli.nix | 28 ++++++++++++++++---------- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index cbf8690..657492d 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -138,16 +138,41 @@ has_nvidia=false has_intel=false has_amd=false has_vm=false +detect_vm() { + if command -v systemd-detect-virt &>/dev/null; then + if systemd-detect-virt --quiet; then + return 0 + fi + fi + for f in /sys/class/dmi/id/product_name /sys/class/dmi/id/sys_vendor; do + if [ -r "$f" ] && grep -Eqi 'qemu|kvm|vmware|virtualbox|hyper-v|microsoft corporation|xen|parallels' "$f"; then + return 0 + fi + done + return 1 +} -if lspci -nn | grep -qi 'vga\|3d\|display'; then +if detect_vm; then + has_vm=true +fi + +if lspci | grep -qi 'vga\|3d\|display'; then while read -r line; do - if echo "$line" | grep -Eqi '\[10de\]'; then + if echo "$line" | grep -Eq '\[10de:'; then has_nvidia=true - elif echo "$line" | grep -Eqi '\[1002\]'; then + elif echo "$line" | grep -Eq '\[1002:'; then has_amd=true - elif echo "$line" | grep -Eqi '\[8086\]'; then + elif echo "$line" | grep -Eq '\[8086:'; then has_intel=true - elif echo "$line" | grep -Eqi '\b(virtio|vmware|qxl|qemu|virtualbox|bochs|hyper-v|microsoft)\b'; then + elif echo "$line" | grep -Eq '\[(1af4|15ad|80ee|1b36|1414|1234|1013):'; then + has_vm=true + elif echo "$line" | grep -qi 'nvidia'; then + has_nvidia=true + elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then + has_amd=true + elif echo "$line" | grep -qi 'intel'; then + has_intel=true + elif echo "$line" | grep -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then has_vm=true fi done < <(lspci -nn | grep -i 'vga\|3d\|display') @@ -155,7 +180,7 @@ if lspci -nn | grep -qi 'vga\|3d\|display'; then if $has_vm; then DETECTED_PROFILE="vm" elif $has_nvidia && $has_amd; then - DETECTED_PROFILE="amd-hybrid" + DETECTED_PROFILE="amd-nvidia-hybrid" elif $has_nvidia && $has_intel; then DETECTED_PROFILE="nvidia-laptop" elif $has_nvidia; then diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 95a0c61..05eae32 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -246,28 +246,36 @@ in if ${pkgs.pciutils}/bin/lspci &> /dev/null; then # Check if lspci is available if ${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then while read -r line; do - if echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi '\[10de\]'; then + if echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[10de:'; then has_nvidia=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi '\[1002\]'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[1002:'; then has_amd=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi '\[8086\]'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[8086:'; then has_intel=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi 'virtio\|vmware\|qxl\|qemu\|virtualbox\|bochs\|hyper-v\|microsoft'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[(1af4|15ad|80ee|1b36|1414|1234|1013):'; then + has_vm=true + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'nvidia'; then + has_nvidia=true + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd\|ati\|advanced micro devices'; then + has_amd=true + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'intel'; then + has_intel=true + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware\|virtualbox\|qxl\|hyper-v\|microsoft corporation\|parallels\|qemu\|bochs\|cirrus\|svga\|virtual'; then has_vm=true fi done < <(${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display') - if "$has_vm"; then + if $has_vm; then detected_profile="vm" - elif "$has_nvidia" && "$has_intel"; then + elif $has_nvidia && $has_intel; then detected_profile="nvidia-laptop" - elif "$has_nvidia" && "$has_amd"; then + elif $has_nvidia && $has_amd; then detected_profile="amd-hybrid" - elif "$has_nvidia"; then + elif $has_nvidia; then detected_profile="nvidia" - elif "$has_amd"; then + elif $has_amd; then detected_profile="amd" - elif "$has_intel"; then + elif $has_intel; then detected_profile="intel" fi fi From 288dee5e72706a12fc0427dbde3f404ceeecf0a1 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 9 Apr 2026 18:43:00 -0400 Subject: [PATCH 209/232] Added the improved GPU detection to zlci/install script On branch zos-next-grub Your branch is up to date with 'origin/zos-next-grub'. Changes to be committed: modified: modules/home/scripts/zcli.nix --- modules/home/scripts/zcli.nix | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 2d1b8ff..e9d0f9b 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -227,30 +227,38 @@ in fi if ${pkgs.pciutils}/bin/lspci &> /dev/null; then # Check if lspci is available - if ${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then + if ${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then while read -r line; do - if echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'nvidia'; then + if echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[10de:'; then + has_nvidia=true + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[1002:'; then + has_amd=true + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[8086:'; then + has_intel=true + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[(1af4|15ad|80ee|1b36|1414|1234|1013):'; then + has_vm=true + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'nvidia'; then has_nvidia=true elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd\|ati\|advanced micro devices'; then has_amd=true elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'intel'; then has_intel=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware\|qxl\|qemu\|virtualbox\|bochs\|hyper-v\|microsoft'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware\|virtualbox\|qxl\|hyper-v\|microsoft corporation\|parallels\|qemu\|bochs\|cirrus\|svga\|virtual'; then has_vm=true fi - done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display') + done < <(${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display') - if "$has_vm"; then + if $has_vm; then detected_profile="vm" - elif "$has_nvidia" && "$has_intel"; then + elif $has_nvidia && $has_intel; then detected_profile="nvidia-laptop" - elif "$has_nvidia" && "$has_amd"; then + elif $has_nvidia && $has_amd; then detected_profile="amd-hybrid" - elif "$has_nvidia"; then + elif $has_nvidia; then detected_profile="nvidia" - elif "$has_amd"; then + elif $has_amd; then detected_profile="amd" - elif "$has_intel"; then + elif $has_intel; then detected_profile="intel" fi fi From f5106616b5d789a35456b4984b68c31d4e7620dd Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 17 Apr 2026 08:43:34 -0400 Subject: [PATCH 210/232] 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 --- flake.lock | 80 +++++++++++++++++++-------------------- modules/core/flatpak.nix | 2 +- modules/core/packages.nix | 2 + 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index d783d53..d6ea328 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1775260434, - "narHash": "sha256-Km+QqtLb3RiO0J3WG44rSffzuEaRW4YFOADgH4VEZaY=", + "lastModified": 1775937104, + "narHash": "sha256-JpU/iDNArShDxtRMse2ZVG4lDsjOHuDRrqt5OsTGXw8=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "633579fda5c8fb0c1e08779c568bad3cff915947", + "rev": "6d808e1c36b430b1e4762085912db3ccf5b2efdf", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1774942619, - "narHash": "sha256-AxUTNmWQA7+l+ArgLc8ZAHMEvGNf8Gdx+jVx0zOu66Q=", + "lastModified": 1776411505, + "narHash": "sha256-7HILfdTOvWzAMmfS3lQV3MDmVrr2Epj8x4c9F3mzOSE=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "638e265b165f9cca9bd827abb52a864de1001aaf", + "rev": "9f31d28882185d30c0e3082fbc52dab1cd4e879f", "type": "github" }, "original": { @@ -52,11 +52,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1774191766, - "narHash": "sha256-bvO+gfuUOVUiBEwAJ5A2RjpysPzCfyXD+DM8piOa1+4=", + "lastModified": 1776083220, + "narHash": "sha256-78QngptaPiKhlDuhUMrN/GDSHhXtEgMqnRSe3sjhjhM=", "ref": "refs/heads/main", - "rev": "7a8fc2e646b97e5ae508a44d3449e3b41345d456", - "revCount": 1336, + "rev": "27d68a7b8b81b3b9afced39b32e06639d470c040", + "revCount": 1353, "type": "git", "url": "https://codeberg.org/LGFae/awww" }, @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1775598298, - "narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=", + "lastModified": 1776373306, + "narHash": "sha256-iAJIzHngGZeLIkjzuuWI6VBsYJ1n89a/Esq0m8R1vjs=", "owner": "nix-community", "repo": "home-manager", - "rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86", + "rev": "d401492e2acd4fea42f7705a3c266cea739c9c36", "type": "github" }, "original": { @@ -430,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1775307257, - "narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=", + "lastModified": 1776350339, + "narHash": "sha256-Rl+tnpvdpf66e/3m+LPNzUoebV3jpiJz7oMxas8FB3I=", "owner": "nix-community", "repo": "nixvim", - "rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff", + "rev": "4f75992439d3d554a3681880510e4b645ca2d15b", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775593740, - "narHash": "sha256-P2bAFa/lx2wzMVVHwIbUOBXTpejzWsAMJACDtEdHXMU=", + "lastModified": 1776302695, + "narHash": "sha256-xZc9o1JLQpmWn2Dqui323+Tq2Ai4sSdtdvbFZCs4qLo=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "48fe0f91a5fa514ca37863b2078b8c20a97fb66b", + "rev": "a7c724181fca5d1aff2d47b18fa733504cfdbda2", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775491791, - "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", + "lastModified": 1775957204, + "narHash": "sha256-d4CVRtAty2GzDYXx4xYQmR+nlOjjKovyprQfZhgLckU=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", + "rev": "68e82fe34c68ee839a9c37e3466820e266af0c86", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1775567832, - "narHash": "sha256-jAnxLY0qPW+qR4f5GTLp2qbtku8b4E2XuJ8mavSIPfY=", + "lastModified": 1776376181, + "narHash": "sha256-N/I4lxWjes7E8n4NEOYaNxxvJ9db+RKHJSH8oDdqR8o=", "owner": "notashelf", "repo": "nvf", - "rev": "d6746a7510ba15e9a3577322a2e5387ab983f970", + "rev": "029ca6d34ad8d830afb56a9963e4baed53848da6", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1775429060, - "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=", + "lastModified": 1776170745, + "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=", "owner": "danth", "repo": "stylix", - "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019", + "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9", "type": "github" }, "original": { @@ -823,11 +823,11 @@ ] }, "locked": { - "lastModified": 1775125835, - "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "75925962939880974e3ab417879daffcba36c4a3", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { @@ -844,11 +844,11 @@ ] }, "locked": { - "lastModified": 1775367672, - "narHash": "sha256-nGC6qrRsWysfR7/8wsSooq0X71rfJjhq1b+dFI6oQtY=", + "lastModified": 1775699406, + "narHash": "sha256-YpDALorsidLjSyS5ozvsNI7Gz/bkmDs/ls/9oHKPv40=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "33cd729244914f1e121477c5de148639c5e73c4a", + "rev": "b05c87c1a474cdd6979a4e5f7058edf4073554df", "type": "github" }, "original": { diff --git a/modules/core/flatpak.nix b/modules/core/flatpak.nix index e513739..2862127 100644 --- a/modules/core/flatpak.nix +++ b/modules/core/flatpak.nix @@ -15,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 diff --git a/modules/core/packages.nix b/modules/core/packages.nix index afc4846..513b2aa 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -62,6 +62,8 @@ in { eza # Beautiful ls Replacement ffmpeg # Terminal Video / Audio Editing file-roller # Archive Manager + gearlever # Manage / run Appimages + icu # dep for gearlever gimp # Great Photo Editor gpu-screen-recorder # needed for nnoctalia-shell power-profiles-daemon # needed for noctalia-shell power cycle From df923a20ff06ed55399c153b47674d17531f50d8 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 17 Apr 2026 15:39:31 -0400 Subject: [PATCH 211/232] pinning treesitter to 25.6 neovim is at 11.6 for snacks plugin compatiblity Now treesitter must be set to match pinning treesitter to 25.6 On branch zos-next-grub Your branch is up to date with 'origin/zos-next-grub'. Changes to be committed: modified: modules/core/overlays.nix --- modules/core/overlays.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index 7c66ed5..702b3ca 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -5,6 +5,15 @@ # Pin Neovim to 0.11.6 (zos-next) (_final: prev: let + tree-sitter-0_25_9 = prev.tree-sitter.overrideAttrs (_old: { + version = "0.25.9"; + src = prev.fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter"; + rev = "v0.25.9"; + hash = "sha256-i7sptOJuLPSl0v8qYF54zfvVKOUtekcFedqapxehzWI="; + }; + }); neovim-unwrapped-0_11_6 = prev.neovim-unwrapped.overrideAttrs (_old: { version = "0.11.6"; src = prev.fetchFromGitHub { @@ -15,6 +24,7 @@ }; }); in { + tree-sitter = tree-sitter-0_25_9; neovim-unwrapped = neovim-unwrapped-0_11_6; neovim = prev.neovim.override {neovim-unwrapped = neovim-unwrapped-0_11_6;}; }) From 72d852522d37310089c60da368f32241beae9233 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 17 Apr 2026 15:48:41 -0400 Subject: [PATCH 212/232] Fixing treesitter getting hash --- modules/core/overlays.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index 702b3ca..a5f8d6e 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -13,6 +13,7 @@ rev = "v0.25.9"; hash = "sha256-i7sptOJuLPSl0v8qYF54zfvVKOUtekcFedqapxehzWI="; }; + cargoHash = ""; }); neovim-unwrapped-0_11_6 = prev.neovim-unwrapped.overrideAttrs (_old: { version = "0.11.6"; From f3088ee10a41c8cbe6041fa5cfefba017f8f6f2e Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 17 Apr 2026 15:55:57 -0400 Subject: [PATCH 213/232] added SHA hash for treesitter --- modules/core/overlays.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index a5f8d6e..c5aed40 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -5,15 +5,21 @@ # Pin Neovim to 0.11.6 (zos-next) (_final: prev: let + tree-sitter-src-0_25_9 = prev.fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter"; + rev = "v0.25.9"; + hash = "sha256-i7sptOJuLPSl0v8qYF54zfvVKOUtekcFedqapxehzWI="; + }; + tree-sitter-cargo-deps-0_25_9 = prev.rustPlatform.fetchCargoVendor { + name = "tree-sitter-0.25.9-vendor"; + src = tree-sitter-src-0_25_9; + hash = ""; + }; tree-sitter-0_25_9 = prev.tree-sitter.overrideAttrs (_old: { version = "0.25.9"; - src = prev.fetchFromGitHub { - owner = "tree-sitter"; - repo = "tree-sitter"; - rev = "v0.25.9"; - hash = "sha256-i7sptOJuLPSl0v8qYF54zfvVKOUtekcFedqapxehzWI="; - }; - cargoHash = ""; + src = tree-sitter-src-0_25_9; + cargoDeps = tree-sitter-cargo-deps-0_25_9; }); neovim-unwrapped-0_11_6 = prev.neovim-unwrapped.overrideAttrs (_old: { version = "0.11.6"; From 5ec9a48d94a22ac010bb8828eaab241c7872c2c9 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 17 Apr 2026 16:01:58 -0400 Subject: [PATCH 214/232] Removed bugsvim not worth effort On branch zos-next-grub Your branch is up to date with 'origin/zos-next-grub'. Changes to be committed: modified: hosts/default/variables.nix modified: hosts/zaneyos-24-vm/variables.nix modified: hosts/zaneyos-next/variables.nix modified: hosts/zaneyos-oem/variables.nix modified: hosts/zos-nix-mirror/variables.nix modified: modules/home/default.nix modified: modules/options.nix --- hosts/default/variables.nix | 2 +- hosts/zaneyos-24-vm/variables.nix | 2 +- hosts/zaneyos-next/variables.nix | 4 ++-- hosts/zaneyos-oem/variables.nix | 2 +- hosts/zos-nix-mirror/variables.nix | 2 +- modules/home/default.nix | 2 -- modules/options.nix | 4 ++-- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index 7ab6a05..ef0ab94 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -36,7 +36,7 @@ _: { helixEnable = false; #To install: Enable here, zcli rebuild, then run zcli doom install doomEmacsEnable = false; - # Neovim config: "nixvim" | "nvf" | "bugsvim" + # Neovim config: "nixvim" | "nvf" neovimConfig = "nixvim"; # Bar/Shell Settings diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix index f6e2d97..1950491 100644 --- a/hosts/zaneyos-24-vm/variables.nix +++ b/hosts/zaneyos-24-vm/variables.nix @@ -36,7 +36,7 @@ _: { helixEnable = true; #To install: Enable here, zcli rebuild, then run zcli doom install doomEmacsEnable = true; - # Neovim config: "nixvim" | "nvf" | "bugsvim" + # Neovim config: "nixvim" | "nvf" neovimConfig = "nixvim"; # Python development tools diff --git a/hosts/zaneyos-next/variables.nix b/hosts/zaneyos-next/variables.nix index f2d1ba6..61e4041 100644 --- a/hosts/zaneyos-next/variables.nix +++ b/hosts/zaneyos-next/variables.nix @@ -36,8 +36,8 @@ _: { helixEnable = true; #To install: Enable here, zcli rebuild, then run zcli doom install doomEmacsEnable = true; - # Neovim config: "nixvim" | "nvf" | "bugsvim" - neovimConfig = "bugsvim"; + # Neovim config: "nixvim" | "nvf" + neovimConfig = "nixvim"; # Bar/Shell Settings # Choose between noctalia or waybar diff --git a/hosts/zaneyos-oem/variables.nix b/hosts/zaneyos-oem/variables.nix index c778f9c..58b1dfa 100644 --- a/hosts/zaneyos-oem/variables.nix +++ b/hosts/zaneyos-oem/variables.nix @@ -31,7 +31,7 @@ _: { helixEnable = true; #To install rebuild, then run zcli doom install doomEmacsEnable = false; - # Neovim config: "nixvim" | "nvf" | "bugsvim" + # Neovim config: "nixvim" | "nvf" neovimConfig = "nixvim"; # Hyprland Settings diff --git a/hosts/zos-nix-mirror/variables.nix b/hosts/zos-nix-mirror/variables.nix index 607145f..8a58a97 100644 --- a/hosts/zos-nix-mirror/variables.nix +++ b/hosts/zos-nix-mirror/variables.nix @@ -36,7 +36,7 @@ _: { helixEnable = true; #To install: Enable here, zcli rebuild, then run zcli doom install doomEmacsEnable = true; - # Neovim config: "nixvim" | "nvf" | "bugsvim" + # Neovim config: "nixvim" | "nvf" neovimConfig = "nixvim"; # Bar/Shell Settings diff --git a/modules/home/default.nix b/modules/home/default.nix index 5875672..1773b07 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -61,8 +61,6 @@ in { ++ ( if neovimConfig == "nixvim" then [./editors/nixvim.nix] - else if neovimConfig == "bugsvim" - then [./editors/bugsvim.nix] else [./editors/nvf.nix] ); } diff --git a/modules/options.nix b/modules/options.nix index 32bd8fe..2e4d028 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -85,9 +85,9 @@ with lib; { description = "Enable Doom Emacs."; }; neovimConfig = mkOption { - type = types.enum ["nixvim" "nvf" "bugsvim"]; + type = types.enum ["nixvim" "nvf"]; default = "nixvim"; - description = "Select Neovim configuration (nixvim, nvf, or bugsvim)."; + description = "Select Neovim configuration (nixvim or nvf)."; }; obsStudioEnable = mkOption { type = types.bool; From 65ed66cab31aece7ca85246385a9a25ddbe48bbd Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 17 Apr 2026 16:03:04 -0400 Subject: [PATCH 215/232] Removed neovim / treesitter overlays On branch zos-next-grub Your branch is up to date with 'origin/zos-next-grub'. Changes to be committed: modified: modules/core/overlays.nix --- modules/core/overlays.nix | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index c5aed40..4a029e1 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -3,38 +3,6 @@ # Provide pkgs.google-antigravity via antigravity-nix overlay inputs.antigravity-nix.overlays.default - # Pin Neovim to 0.11.6 (zos-next) - (_final: prev: let - tree-sitter-src-0_25_9 = prev.fetchFromGitHub { - owner = "tree-sitter"; - repo = "tree-sitter"; - rev = "v0.25.9"; - hash = "sha256-i7sptOJuLPSl0v8qYF54zfvVKOUtekcFedqapxehzWI="; - }; - tree-sitter-cargo-deps-0_25_9 = prev.rustPlatform.fetchCargoVendor { - name = "tree-sitter-0.25.9-vendor"; - src = tree-sitter-src-0_25_9; - hash = ""; - }; - tree-sitter-0_25_9 = prev.tree-sitter.overrideAttrs (_old: { - version = "0.25.9"; - src = tree-sitter-src-0_25_9; - cargoDeps = tree-sitter-cargo-deps-0_25_9; - }); - neovim-unwrapped-0_11_6 = prev.neovim-unwrapped.overrideAttrs (_old: { - version = "0.11.6"; - src = prev.fetchFromGitHub { - owner = "neovim"; - repo = "neovim"; - rev = "v0.11.6"; - hash = "sha256-GdfCaKNe/qPaUV2NJPXY+ATnQNWnyFTFnkOYDyLhTNg="; - }; - }); - in { - tree-sitter = tree-sitter-0_25_9; - neovim-unwrapped = neovim-unwrapped-0_11_6; - neovim = prev.neovim.override {neovim-unwrapped = neovim-unwrapped-0_11_6;}; - }) # Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk (_final: prev: { From 408d1ede6d6860c24a473ff1c23ec655d5770bd6 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 17 Apr 2026 16:14:41 -0400 Subject: [PATCH 216/232] Updated flake after removing bugsvim On branch zos-next-grub Your branch is up to date with 'origin/zos-next-grub'. Changes to be committed: modified: flake.lock --- flake.lock | 74 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index daf4ad7..e30e4ce 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1774942619, - "narHash": "sha256-AxUTNmWQA7+l+ArgLc8ZAHMEvGNf8Gdx+jVx0zOu66Q=", + "lastModified": 1776411505, + "narHash": "sha256-7HILfdTOvWzAMmfS3lQV3MDmVrr2Epj8x4c9F3mzOSE=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "638e265b165f9cca9bd827abb52a864de1001aaf", + "rev": "9f31d28882185d30c0e3082fbc52dab1cd4e879f", "type": "github" }, "original": { @@ -30,11 +30,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1774191766, - "narHash": "sha256-bvO+gfuUOVUiBEwAJ5A2RjpysPzCfyXD+DM8piOa1+4=", + "lastModified": 1776083220, + "narHash": "sha256-78QngptaPiKhlDuhUMrN/GDSHhXtEgMqnRSe3sjhjhM=", "ref": "refs/heads/main", - "rev": "7a8fc2e646b97e5ae508a44d3449e3b41345d456", - "revCount": 1336, + "rev": "27d68a7b8b81b3b9afced39b32e06639d470c040", + "revCount": 1353, "type": "git", "url": "https://codeberg.org/LGFae/awww" }, @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -280,11 +280,11 @@ ] }, "locked": { - "lastModified": 1775598298, - "narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=", + "lastModified": 1776454077, + "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=", "owner": "nix-community", "repo": "home-manager", - "rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86", + "rev": "565e5349208fe7d0831ef959103c9bafbeac0681", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1775307257, - "narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=", + "lastModified": 1776452249, + "narHash": "sha256-tpCsY9kIEfcitiV3JwUqYTmxwewwZKQlZSNUBqb9kF0=", "owner": "nix-community", "repo": "nixvim", - "rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff", + "rev": "698d17490e19e2e360a6ce49b1af9134d1c6eacd", "type": "github" }, "original": { @@ -416,11 +416,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775593740, - "narHash": "sha256-P2bAFa/lx2wzMVVHwIbUOBXTpejzWsAMJACDtEdHXMU=", + "lastModified": 1776302695, + "narHash": "sha256-xZc9o1JLQpmWn2Dqui323+Tq2Ai4sSdtdvbFZCs4qLo=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "48fe0f91a5fa514ca37863b2078b8c20a97fb66b", + "rev": "a7c724181fca5d1aff2d47b18fa733504cfdbda2", "type": "github" }, "original": { @@ -439,11 +439,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775491791, - "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", + "lastModified": 1775957204, + "narHash": "sha256-d4CVRtAty2GzDYXx4xYQmR+nlOjjKovyprQfZhgLckU=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", + "rev": "68e82fe34c68ee839a9c37e3466820e266af0c86", "type": "github" }, "original": { @@ -491,11 +491,11 @@ ] }, "locked": { - "lastModified": 1775567832, - "narHash": "sha256-jAnxLY0qPW+qR4f5GTLp2qbtku8b4E2XuJ8mavSIPfY=", + "lastModified": 1776443141, + "narHash": "sha256-0GPSO7piciOuKYnTAvCFChlRM51HIYS8j1metFSHkAg=", "owner": "notashelf", "repo": "nvf", - "rev": "d6746a7510ba15e9a3577322a2e5387ab983f970", + "rev": "a2708696b1c3805bbde5b6292c214f56d3b2996d", "type": "github" }, "original": { @@ -562,11 +562,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1775429060, - "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=", + "lastModified": 1776170745, + "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=", "owner": "danth", "repo": "stylix", - "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019", + "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9", "type": "github" }, "original": { @@ -694,11 +694,11 @@ ] }, "locked": { - "lastModified": 1775125835, - "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "75925962939880974e3ab417879daffcba36c4a3", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { @@ -715,11 +715,11 @@ ] }, "locked": { - "lastModified": 1775367672, - "narHash": "sha256-nGC6qrRsWysfR7/8wsSooq0X71rfJjhq1b+dFI6oQtY=", + "lastModified": 1775699406, + "narHash": "sha256-YpDALorsidLjSyS5ozvsNI7Gz/bkmDs/ls/9oHKPv40=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "33cd729244914f1e121477c5de148639c5e73c4a", + "rev": "b05c87c1a474cdd6979a4e5f7058edf4073554df", "type": "github" }, "original": { From 81c9573ea02c7e07d233aa0b93826cf84b63f468 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 17 Apr 2026 16:20:30 -0400 Subject: [PATCH 217/232] Removed bugsvim LUA code and nix file --- modules/home/editors/bugsvim-nvim/.luacheckrc | 14 -- modules/home/editors/bugsvim-nvim/.luarc.json | 5 - .../home/editors/bugsvim-nvim/.stylua.toml | 6 - modules/home/editors/bugsvim-nvim/init.lua | 1 - .../bugsvim-nvim/lua/config/autocmds.lua | 91 -------- .../bugsvim-nvim/lua/config/globals.lua | 7 - .../bugsvim-nvim/lua/config/keymaps.lua | 49 ----- .../editors/bugsvim-nvim/lua/config/lazy.lua | 48 ----- .../bugsvim-nvim/lua/config/options.lua | 108 ---------- .../bugsvim-nvim/lua/plugins/blink-cmp.lua | 61 ------ .../bugsvim-nvim/lua/plugins/colortheme.lua | 16 -- .../bugsvim-nvim/lua/plugins/conform.lua | 54 ----- .../bugsvim-nvim/lua/plugins/gitsigns.lua | 73 ------- .../bugsvim-nvim/lua/plugins/lazydev.lua | 18 -- .../bugsvim-nvim/lua/plugins/lualine.lua | 97 --------- .../lua/plugins/markdown-preview.lua | 22 -- .../bugsvim-nvim/lua/plugins/markdown.lua | 19 -- .../bugsvim-nvim/lua/plugins/mini-nvim.lua | 36 ---- .../bugsvim-nvim/lua/plugins/noice.lua | 31 --- .../bugsvim-nvim/lua/plugins/nvim-dap.lua | 87 -------- .../bugsvim-nvim/lua/plugins/nvim-lint.lua | 27 --- .../lua/plugins/nvim-lspconfig.lua | 38 ---- .../lua/plugins/nvim-treesitter.lua | 110 ---------- .../bugsvim-nvim/lua/plugins/persistance.lua | 19 -- .../bugsvim-nvim/lua/plugins/snacks.lua | 196 ------------------ .../lua/plugins/todo-comments.lua | 21 -- .../bugsvim-nvim/lua/plugins/which-key.lua | 23 -- .../bugsvim-nvim/lua/servers/bashls.lua | 14 -- .../bugsvim-nvim/lua/servers/clangd.lua | 18 -- .../bugsvim-nvim/lua/servers/cssls.lua | 16 -- .../editors/bugsvim-nvim/lua/servers/html.lua | 16 -- .../bugsvim-nvim/lua/servers/hyprls.lua | 16 -- .../editors/bugsvim-nvim/lua/servers/init.lua | 33 --- .../bugsvim-nvim/lua/servers/lua_ls.lua | 27 --- .../bugsvim-nvim/lua/servers/nil_ls.lua | 16 -- .../bugsvim-nvim/lua/servers/pyright.lua | 24 --- .../lua/servers/rust_analyzer.lua | 21 -- .../bugsvim-nvim/lua/servers/tailwindcss.lua | 21 -- .../bugsvim-nvim/lua/servers/ts_ls.lua | 47 ----- .../bugsvim-nvim/lua/utils/diagnostics.lua | 47 ----- .../editors/bugsvim-nvim/lua/utils/lsp.lua | 44 ---- modules/home/editors/bugsvim.nix | 77 ------- 42 files changed, 1714 deletions(-) delete mode 100644 modules/home/editors/bugsvim-nvim/.luacheckrc delete mode 100644 modules/home/editors/bugsvim-nvim/.luarc.json delete mode 100644 modules/home/editors/bugsvim-nvim/.stylua.toml delete mode 100644 modules/home/editors/bugsvim-nvim/init.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/config/globals.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/config/keymaps.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/config/lazy.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/config/options.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/blink-cmp.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/colortheme.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/conform.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/gitsigns.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/lazydev.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/lualine.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/markdown-preview.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/markdown.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/mini-nvim.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/noice.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/nvim-dap.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lint.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lspconfig.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/nvim-treesitter.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/persistance.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/snacks.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/todo-comments.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/plugins/which-key.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/bashls.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/clangd.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/cssls.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/html.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/hyprls.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/init.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/lua_ls.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/nil_ls.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/pyright.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/rust_analyzer.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/tailwindcss.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/servers/ts_ls.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/utils/diagnostics.lua delete mode 100644 modules/home/editors/bugsvim-nvim/lua/utils/lsp.lua delete mode 100644 modules/home/editors/bugsvim.nix diff --git a/modules/home/editors/bugsvim-nvim/.luacheckrc b/modules/home/editors/bugsvim-nvim/.luacheckrc deleted file mode 100644 index 588084d..0000000 --- a/modules/home/editors/bugsvim-nvim/.luacheckrc +++ /dev/null @@ -1,14 +0,0 @@ -globals = { - 'vim', - 'Snacks', -} - -read_globals = { - 'use', -} - -ignore = { - '212', -- Unused argument (common in callbacks) - '213', -- Unused loop variable - '631', -- Line is too long (if you prefer longer lines) -} diff --git a/modules/home/editors/bugsvim-nvim/.luarc.json b/modules/home/editors/bugsvim-nvim/.luarc.json deleted file mode 100644 index e310e5a..0000000 --- a/modules/home/editors/bugsvim-nvim/.luarc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "diagnostics.disable": [ - "missing-parameter" - ] -} diff --git a/modules/home/editors/bugsvim-nvim/.stylua.toml b/modules/home/editors/bugsvim-nvim/.stylua.toml deleted file mode 100644 index 139e939..0000000 --- a/modules/home/editors/bugsvim-nvim/.stylua.toml +++ /dev/null @@ -1,6 +0,0 @@ -column_width = 160 -line_endings = "Unix" -indent_type = "Spaces" -indent_width = 2 -quote_style = "AutoPreferSingle" -call_parentheses = "None" diff --git a/modules/home/editors/bugsvim-nvim/init.lua b/modules/home/editors/bugsvim-nvim/init.lua deleted file mode 100644 index 7e3da95..0000000 --- a/modules/home/editors/bugsvim-nvim/init.lua +++ /dev/null @@ -1 +0,0 @@ -require 'config.lazy' diff --git a/modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua b/modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua deleted file mode 100644 index a3ef1e7..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua +++ /dev/null @@ -1,91 +0,0 @@ --- ================================================================================================ --- TITLE : auto-commands --- ABOUT : automatically run code on defined events (e.g. save, yank) --- ================================================================================================ - --- Disable some mini plugins for snacks dashboard buffer -vim.api.nvim_create_autocmd('User', { - pattern = 'SnacksDashboardOpened', - callback = function(args) - vim.b[args.buf].minitrailspace_disable = true - vim.b[args.buf].minicursorword_disable = true - end, -}) - --- Restore last cursor position when reopening a file -local last_cursor_group = vim.api.nvim_create_augroup('LastCursorGroup', {}) -vim.api.nvim_create_autocmd('BufReadPost', { - group = last_cursor_group, - callback = function() - local mark = vim.api.nvim_buf_get_mark(0, '"') - local lcount = vim.api.nvim_buf_line_count(0) - if mark[1] > 0 and mark[1] <= lcount then - pcall(vim.api.nvim_win_set_cursor, 0, mark) - end - end, -}) - --- Highlight the yanked text for 200ms -local highlight_yank_group = vim.api.nvim_create_augroup('HighlightYank', {}) -vim.api.nvim_create_autocmd('TextYankPost', { - group = highlight_yank_group, - pattern = '*', - callback = function() - vim.hl.on_yank { - higroup = 'IncSearch', - timeout = 200, - } - end, -}) - --- On attach for lsp -local on_attach = require('utils.lsp').on_attach -local lsp_on_attach_group = vim.api.nvim_create_augroup('LspMappings', {}) -vim.api.nvim_create_autocmd('LspAttach', { - group = lsp_on_attach_group, - callback = on_attach, -}) - --- Pretty lsp progress notification ----@type table -local progress = vim.defaulttable() -vim.api.nvim_create_autocmd('LspProgress', { - ---@param ev {data: {client_id: integer, params: lsp.ProgressParams}} - callback = function(ev) - local client = vim.lsp.get_client_by_id(ev.data.client_id) - local value = ev.data.params.value --[[@as {percentage?: number, title?: string, message?: string, kind: "begin" | "report" | "end"}]] - if not client or type(value) ~= 'table' then - return - end - local p = progress[client.id] - - for i = 1, #p + 1 do - if i == #p + 1 or p[i].token == ev.data.params.token then - p[i] = { - token = ev.data.params.token, - msg = ('[%3d%%] %s%s'):format( - value.kind == 'end' and 100 or value.percentage or 100, - value.title or '', - value.message and (' **%s**'):format(value.message) or '' - ), - done = value.kind == 'end', - } - break - end - end - - local msg = {} ---@type string[] - progress[client.id] = vim.tbl_filter(function(v) - return table.insert(msg, v.msg) or not v.done - end, p) - - local spinner = { '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏' } - vim.notify(table.concat(msg, '\n'), 'info', { - id = 'lsp_progress', - title = client.name, - opts = function(notif) - notif.icon = #progress[client.id] == 0 and ' ' or spinner[math.floor(vim.uv.hrtime() / (1e6 * 80)) % #spinner + 1] - end, - }) - end, -}) diff --git a/modules/home/editors/bugsvim-nvim/lua/config/globals.lua b/modules/home/editors/bugsvim-nvim/lua/config/globals.lua deleted file mode 100644 index 61117a3..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/config/globals.lua +++ /dev/null @@ -1,7 +0,0 @@ --- ================================================================================================ --- TITLE : globals --- ABOUT : Setting up our global and local leader --- ================================================================================================ - -vim.g.mapleader = ' ' -vim.g.maplocalleader = ' ' diff --git a/modules/home/editors/bugsvim-nvim/lua/config/keymaps.lua b/modules/home/editors/bugsvim-nvim/lua/config/keymaps.lua deleted file mode 100644 index 06f4d94..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/config/keymaps.lua +++ /dev/null @@ -1,49 +0,0 @@ --- ================================================================================================ --- TITLE: NeoVim keymaps --- ABOUT: sets some quality-of-life keymaps --- ================================================================================================ - --- Center screen when jumping -vim.keymap.set('n', 'n', 'nzzzv', { desc = 'Next search result (centered)' }) -vim.keymap.set('n', 'N', 'Nzzzv', { desc = 'Previous search result (centered)' }) -vim.keymap.set('n', '', 'zz', { desc = 'Half page down (centered)' }) -vim.keymap.set('n', '', 'zz', { desc = 'Half page up (centered)' }) - --- Buffer navigation -vim.keymap.set('n', 'bn', 'bnext', { desc = 'Next buffer' }) -vim.keymap.set('n', 'bp', 'bprevious', { desc = 'Previous buffer' }) -vim.keymap.set('n', '', 'bnext', { desc = 'Next buffer' }) -vim.keymap.set('n', '', 'bprevious', { desc = 'Previous buffer' }) - --- Better window navigation -vim.keymap.set('n', '', 'h', { desc = 'Move to left window' }) -vim.keymap.set('n', '', 'j', { desc = 'Move to bottom window' }) -vim.keymap.set('n', '', 'k', { desc = 'Move to top window' }) -vim.keymap.set('n', '', 'l', { desc = 'Move to right window' }) - --- Splitting & Resizing -vim.keymap.set('n', 'sv', 'vsplit', { desc = 'Split window vertically' }) -vim.keymap.set('n', 'sh', 'split', { desc = 'Split window horizontally' }) -vim.keymap.set('n', '', 'resize +2', { desc = 'Increase window height' }) -vim.keymap.set('n', '', 'resize -2', { desc = 'Decrease window height' }) -vim.keymap.set('n', '', 'vertical resize -2', { desc = 'Decrease window width' }) -vim.keymap.set('n', '', 'vertical resize +2', { desc = 'Increase window width' }) - --- Better indenting in visual mode -vim.keymap.set('v', '<', '', '>gv', { desc = 'Indent right and reselect' }) - --- Better J behavior -vim.keymap.set('n', 'J', 'mzJ`z', { desc = 'Join lines and keep cursor position' }) - --- Keep last yanked when pasting -vim.keymap.set('v', 'p', '"_dP', { noremap = true, silent = true }) - --- Quick config editing -vim.keymap.set('n', 'rc', 'e ~/.config/nvim/init.lua', { desc = 'Edit config' }) - --- Markdown keymaps -vim.keymap.set('n', 'mc', 'MarkdownCheckbox', { desc = 'Toggle markdown checkbox' }) -vim.keymap.set('n', 'mp', 'MarkdownPreview', { desc = 'Open markdown preview' }) -vim.keymap.set('n', 'mt', 'MarkdownPreviewToggle', { desc = 'Toggle markdown preview' }) -vim.keymap.set('n', 'ms', 'MarkdownPreviewStop', { desc = 'Stop markdown preview' }) diff --git a/modules/home/editors/bugsvim-nvim/lua/config/lazy.lua b/modules/home/editors/bugsvim-nvim/lua/config/lazy.lua deleted file mode 100644 index 599967d..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/config/lazy.lua +++ /dev/null @@ -1,48 +0,0 @@ --- ================================================================================================ --- TITLE: installing lazy plugin manager --- ABOUT: Bootstarp and configure lazy.nvim plugin manager --- ================================================================================================ - --- Bootstrap lazy.nvim -local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = 'https://github.com/folke/lazy.nvim.git' - local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { 'Failed to clone lazy.nvim:\n', 'ErrorMsg' }, - { out, 'WarningMsg' }, - { '\nPress any key to exit...' }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end -end -vim.opt.rtp:prepend(lazypath) - -require 'config.options' -require 'config.globals' -require 'config.keymaps' -require 'config.autocmds' - --- Setup diagnostics -require('utils.diagnostics').setup() - --- Setup lazy.nvim -require('lazy').setup { - spec = { - -- import your plugins - { import = 'plugins' }, - }, - rtp = { - disabled_plugins = { - 'netrw', - 'netrwPlugin', - }, - }, - -- Configure any other settings here. See the documentation for more details. - -- colorscheme that will be used when installing plugins. - install = { colorscheme = { 'tokyonight-night' } }, - -- automatically check for plugin updates - checker = { enabled = true }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/config/options.lua b/modules/home/editors/bugsvim-nvim/lua/config/options.lua deleted file mode 100644 index f276246..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/config/options.lua +++ /dev/null @@ -1,108 +0,0 @@ --- ================================================================================================ --- TITLE : NeoVim options --- ABOUT : basic settings native to neovim --- ================================================================================================ - --- Basic Settings -vim.opt.number = true -- Line numbers -vim.opt.relativenumber = false -- Relative line numbers -vim.opt.cursorline = true -- Highlight current line -vim.opt.scrolloff = 10 -- Keep 10 lines above/below cursor -vim.opt.sidescrolloff = 8 -- Keep 8 columns left/right of cursor -vim.opt.wrap = false -- Don't wrap lines -vim.opt.cmdheight = 1 -- Command line height -vim.opt.spelllang = { 'en', 'de' } -- Set language for spellchecking - --- Tabbing / Indentation -vim.opt.tabstop = 2 -- Tab width -vim.opt.shiftwidth = 2 -- Indent width -vim.opt.softtabstop = 2 -- Soft tab stop -vim.opt.expandtab = true -- Use spaces instead of tabs -vim.opt.smartindent = true -- Smart auto-indenting -vim.opt.autoindent = true -- Copy indent from current line -vim.opt.grepprg = 'rg --vimgrep' -- Use ripgrep if available -vim.opt.grepformat = '%f:%l:%c:%m' -- filename, line number, column, content - --- Search Settings -vim.opt.ignorecase = true -- Case-insensitive search -vim.opt.smartcase = true -- Case-sensitive if uppercase in search -vim.opt.hlsearch = false -- Don't highlight search results -vim.opt.incsearch = true -- Show matches as you type - --- Visual Settings -vim.opt.termguicolors = true -- Enable 24-bit colors -vim.opt.signcolumn = 'yes' -- Always show sign column -vim.opt.colorcolumn = '100' -- Show column at 100 characters -vim.opt.showmatch = true -- Highlight matching brackets -vim.opt.matchtime = 2 -- How long to show matching bracket -vim.opt.completeopt = 'menuone,noinsert,noselect' -- Completion options -vim.opt.showmode = false -- Don't show mode in command line -vim.opt.pumheight = 10 -- Popup menu height -vim.opt.pumblend = 10 -- Popup menu transparency -vim.opt.winblend = 0 -- Floating window transparency -vim.opt.conceallevel = 0 -- Don't hide markup -vim.opt.concealcursor = '' -- Show markup even on cursor line -vim.opt.lazyredraw = false -- redraw while executing macros (butter UX) -vim.opt.redrawtime = 10000 -- Timeout for syntax highlighting redraw -vim.opt.maxmempattern = 20000 -- Max memory for pattern matching -vim.opt.synmaxcol = 300 -- Syntax highlighting column limit - --- File Handling -vim.opt.backup = false -- Don't create backup files -vim.opt.writebackup = false -- Don't backup before overwriting -vim.opt.swapfile = false -- Don't create swap files -vim.opt.undofile = true -- Persistent undo -vim.opt.updatetime = 300 -- Time in ms to trigger CursorHold -vim.opt.timeoutlen = 500 -- Time in ms to wait for mapped sequence -vim.opt.ttimeoutlen = 0 -- No wait for key code sequences -vim.opt.autoread = true -- Auto-reload file if changed outside -vim.opt.autowrite = false -- Don't auto-save on some events -vim.opt.diffopt:append 'vertical' -- Vertical diff splits -vim.opt.diffopt:append 'algorithm:patience' -- Better diff algorithm -vim.opt.diffopt:append 'linematch:60' -- Better diff highlighting (smart line matching) - --- Set undo directory and ensure it exists -local undodir = '~/.local/share/nvim/undodir' -- Undo directory path -vim.opt.undodir = vim.fn.expand(undodir) -- Expand to full path -local undodir_path = vim.fn.expand(undodir) -if vim.fn.isdirectory(undodir_path) == 0 then - vim.fn.mkdir(undodir_path, 'p') -- Create if not exists -end - --- Behavior Settings -vim.opt.errorbells = false -- Disable error sounds -vim.opt.backspace = 'indent,eol,start' -- Make backspace behave naturally -vim.opt.autochdir = false -- Don't change directory automatically -vim.opt.iskeyword:append '-' -- Treat dash as part of a word -vim.opt.path:append '**' -- Search into subfolders with `gf` -vim.opt.selection = 'inclusive' -- Use inclusive selection -vim.opt.mouse = 'a' -- Enable mouse support -vim.opt.clipboard:append 'unnamedplus' -- Use system clipboard -vim.opt.modifiable = true -- Allow editing buffers -vim.opt.encoding = 'UTF-8' -- Use UTF-8 encoding -vim.opt.wildmenu = true -- Enable command-line completion menu -vim.opt.wildmode = 'longest:full,full' -- Completion mode for command-line -vim.opt.wildignorecase = true -- Case-insensitive tab completion in commands - --- Cursor Settings -vim.opt.guicursor = { - 'n-v-c:block', -- Normal, Visual, Command-line - 'i-ci-ve:block', -- Insert, Command-line Insert, Visual-exclusive - 'r-cr:hor20', -- Replace, Command-line Replace - 'o:hor50', -- Operator-pending - 'a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor', -- All modes: blinking & highlight groups - 'sm:block-blinkwait175-blinkoff150-blinkon175', -- Showmatch mode -} - --- Folding Settings -vim.opt.foldmethod = 'expr' -- Use expression for folding -vim.opt.foldexpr = 'v:lua.vim.treesitter.foldexpr()' -- Use treesitter for folding -vim.opt.foldlevel = 99 -- Keep all folds open by default - --- Split Behavior -vim.opt.splitbelow = true -- Horizontal splits open below -vim.opt.splitright = true -- Vertical splits open to the right - --- List characters -vim.o.list = true -- Enable list -vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } -- Set how listchars will look diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/blink-cmp.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/blink-cmp.lua deleted file mode 100644 index 596d0d5..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/blink-cmp.lua +++ /dev/null @@ -1,61 +0,0 @@ --- ================================================================================================ --- TITLE : blink-cmp --- ABOUT : For autocompletions --- LINKS : blink.cmp https://github.com/saghen/blink.cmp --- ================================================================================================ -return { - 'saghen/blink.cmp', - event = 'InsertEnter', - version = '1.*', - dependencies = { - { - 'L3MON4D3/LuaSnip', - version = '2.*', - build = 'make install_jsregexp', - dependencies = { - { - 'rafamadriz/friendly-snippets', - config = function() - require('luasnip.loaders.from_vscode').lazy_load() - end, - }, - }, - opts = { - history = true, - delete_check_events = 'TextChanged', - }, - }, - 'folke/lazydev.nvim', - }, - --- @module 'blink.cmp' - --- @type blink.cmp.Config - opts = { - keymap = { - preset = 'default', - [''] = { 'accept', 'fallback' }, - [''] = { 'select_next', 'fallback' }, - [''] = { 'select_prev', 'fallback' }, - }, - appearance = { - nerd_font_variant = 'mono', - }, - completion = { - documentation = { - auto_show = true, - auto_show_delay_ms = 500, - }, - }, - sources = { - default = { 'lsp', 'path', 'snippets', 'buffer', 'lazydev' }, - providers = { - lazydev = { - module = 'lazydev.integrations.blink', - score_offset = 100, - }, - }, - }, - snippets = { preset = 'luasnip' }, - fuzzy = { implementation = 'prefer_rust_with_warning' }, - signature = { enabled = true }, - }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/colortheme.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/colortheme.lua deleted file mode 100644 index 2a2c958..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/colortheme.lua +++ /dev/null @@ -1,16 +0,0 @@ --- ================================================================================================ --- TITLE : tokyonight-nvim --- ABOUT : A cool dark vivid tokyonight color theme created by folke(the G.O.A.T) --- LINKS : --- > github : https://github.com/folke/tokyonight.nvim --- ================================================================================================ - -return { - 'folke/tokyonight.nvim', - lazy = false, - priority = 1000, - opts = {}, - init = function() - vim.cmd [[colorscheme tokyonight-night]] - end, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/conform.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/conform.lua deleted file mode 100644 index 48e6b4e..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/conform.lua +++ /dev/null @@ -1,54 +0,0 @@ --- ================================================================================================ --- TITLE : conform.nvim --- ABOUT : For auto formatting --- LINKS : conform.nvim https://github.com/stevearc/conform.nvim --- ================================================================================================ - -return { - 'stevearc/conform.nvim', - event = { 'BufWritePre' }, - cmd = { 'ConformInfo' }, - keys = { - { - 'cf', - function() - require('conform').format { async = true, lsp_format = 'fallback' } - end, - mode = '', - desc = 'Format buffer', - }, - }, - opts = { - notify_on_error = false, - format_on_save = function(bufnr) - local disable_filetypes = { c = false, cpp = false } - if disable_filetypes[vim.bo[bufnr].filetype] then - return nil - else - return { - timeout_ms = 500, - lsp_format = 'fallback', - } - end - end, - formatters_by_ft = { - lua = { 'stylua' }, - python = { 'ruff_format' }, - javascript = { 'prettierd' }, - javascriptreact = { 'prettierd' }, - typescript = { 'prettierd' }, - typescriptreact = { 'prettierd' }, - html = { 'prettierd' }, - css = { 'prettierd' }, - scss = { 'prettierd' }, - json = { 'prettierd' }, - jsonc = { 'prettierd' }, - markdown = { 'prettierd' }, - yaml = { 'prettierd' }, - c = { 'clang-format' }, - cpp = { 'clang-format' }, - bash = { 'shfmt' }, - nix = { 'alejandra' }, - }, - }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/gitsigns.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/gitsigns.lua deleted file mode 100644 index c5f979c..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/gitsigns.lua +++ /dev/null @@ -1,73 +0,0 @@ --- ================================================================================================ --- TITLE : gitsigns.nvim --- LINKS : --- > github : https://github.com/lewis6991/gitsigns.nvim --- ABOUT : Deep buffer integration for Git --- ================================================================================================ - -return { - 'lewis6991/gitsigns.nvim', - event = { 'BufReadPre', 'BufNewFile' }, - opts = { - signs = { - add = { text = '▎' }, - change = { text = '▎' }, - delete = { text = '' }, - topdelete = { text = '' }, - changedelete = { text = '▎' }, - untracked = { text = '▎' }, - }, - signs_staged = { - add = { text = '▎' }, - change = { text = '▎' }, - delete = { text = '' }, - topdelete = { text = '' }, - changedelete = { text = '▎' }, - }, - on_attach = function(buffer) - local gs = package.loaded.gitsigns - - local function map(mode, l, r, desc) - vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc, silent = true }) - end - - -- stylua: ignore start - map("n", "]h", function() - if vim.wo.diff then - vim.cmd.normal({ "]c", bang = true }) - else - gs.nav_hunk("next") - end - end, "Next Hunk") - map("n", "[h", function() - if vim.wo.diff then - vim.cmd.normal({ "[c", bang = true }) - else - gs.nav_hunk("prev") - end - end, "Prev Hunk") - map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk") - map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk") - map({ "n", "x" }, "ghs", ":Gitsigns stage_hunk", "Stage Hunk") - map({ "n", "x" }, "ghr", ":Gitsigns reset_hunk", "Reset Hunk") - map("n", "ghS", gs.stage_buffer, "Stage Buffer") - map("n", "ghu", gs.undo_stage_hunk, "Undo Stage Hunk") - map("n", "ghR", gs.reset_buffer, "Reset Buffer") - map("n", "ghp", gs.preview_hunk_inline, "Preview Hunk Inline") - map("n", "ghb", function() gs.blame_line({ full = true }) end, "Blame Line") - map("n", "ghB", function() gs.blame() end, "Blame Buffer") - map("n", "ghd", gs.diffthis, "Diff This") - map("n", "ghD", function() gs.diffthis("~") end, "Diff This ~") - map({ "o", "x" }, "ih", ":Gitsigns select_hunk", "GitSigns Select Hunk") - Snacks.toggle({ - name = "Git Signs", - get = function() - return require("gitsigns.config").config.signcolumn - end, - set = function(state) - require("gitsigns").toggle_signs(state) - end, - }):map("uG") - end, - }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/lazydev.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/lazydev.lua deleted file mode 100644 index 952d99f..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/lazydev.lua +++ /dev/null @@ -1,18 +0,0 @@ --- ================================================================================================ --- TITLE : Lazydev nvim --- ABOUT : For faster lua_ls startup --- LINKS : lazydev.nvim : https://github.com/folke/lazydev.nvim --- ================================================================================================ - -return { - 'folke/lazydev.nvim', - ft = 'lua', - opts = { - library = { - -- Load luvit types when the `vim.uv` word is found - { path = '${3rd}/luv/library', words = { 'vim%.uv' } }, - -- Add snacks types - { path = 'snacks.nvim', words = { 'Snacks', 'snacks.Config' } }, - }, - }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/lualine.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/lualine.lua deleted file mode 100644 index 3230cb0..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,97 +0,0 @@ --- ================================================================================================ --- TITLE : lualine.nvim --- LINKS : --- > github : https://github.com/nvim-lualine/lualine.nvim --- ABOUT : A blazing fast and easy to configure Neovim statusline written in Lua. --- ================================================================================================ -return { - 'nvim-lualine/lualine.nvim', - event = 'VeryLazy', - config = function() - local hide_in_width = function() - return vim.fn.winwidth(0) > 100 - end - - local mode = { - 'mode', - fmt = function(str) - if hide_in_width() then - return ' ' .. str - else - return ' ' .. str:sub(1, 1) -- displays only the first character of the mode - end - end, - } - - local filename = { - 'filename', - file_status = true, -- displays file status (readonly status, modified status) - path = 0, -- 0 = just filename, 1 = relative path, 2 = absolute path - } - - local diagnostics = { - 'diagnostics', - sources = { 'nvim_diagnostic' }, - sections = { 'error', 'warn' }, - symbols = { error = ' ', warn = ' ', info = ' ', hint = ' ' }, - colored = false, - update_in_insert = false, - always_visible = false, - cond = hide_in_width, - } - - local diff = { - 'diff', - colored = false, - symbols = { added = ' ', modified = ' ', removed = ' ' }, -- changes diff symbols - cond = hide_in_width, - } - - require('lualine').setup { - options = { - icons_enabled = true, - theme = 'tokyonight', -- Set theme based on environment variable - -- Some useful glyphs: - -- https://www.nerdfonts.com/cheat-sheet - --         - section_separators = { left = '', right = '' }, - component_separators = { left = '', right = '' }, - disabled_filetypes = { 'snacks_dashboard' }, - always_divide_middle = true, - }, - sections = { - lualine_a = { mode }, - lualine_b = { 'branch' }, - lualine_c = { filename }, - lualine_x = { - Snacks.profiler.status(), - { - require('lazy.status').updates, - cond = require('lazy.status').has_updates, - color = function() - return { fg = Snacks.util.color 'Special' } - end, - }, - diagnostics, - diff, - { 'filetype', cond = hide_in_width }, - { 'encoding', cond = hide_in_width }, - }, - lualine_y = { 'location' }, - lualine_z = { 'progress' }, - }, - inactive_sections = { - lualine_a = {}, - lualine_b = {}, - lualine_c = { { 'filename', path = 1 } }, - lualine_x = { { 'location', padding = 0 } }, - lualine_y = {}, - lualine_z = {}, - }, - tabline = { - lualine_a = { { 'buffers', show_filename_only = true } }, - }, - extensions = { 'fugitive' }, - } - end, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/markdown-preview.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/markdown-preview.lua deleted file mode 100644 index 2919650..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/markdown-preview.lua +++ /dev/null @@ -1,22 +0,0 @@ --- ================================================================================================ --- TITLE: markdown-preview.nvim --- ABOUT: Preview markdown files in browser with live updates --- LINKS: markdown-preview.nvim https://github.com/iamcco/markdown-preview.nvim --- ================================================================================================ -return { - "iamcco/markdown-preview.nvim", - cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, - ft = { "markdown" }, - init = function() - vim.g.mkdp_auto_start = 0 - vim.g.mkdp_auto_close = 0 - vim.g.mkdp_refresh_slow = 0 - vim.g.mkdp_command_delay = 100 - vim.g.mkdp_open_to_the_world = 0 - vim.g.mkdp_open_ip = "" - vim.g.mkdp_browser = "" - vim.g.mkdp_echo_preview_url = 1 - vim.g.mkdp_page_title = "「${name}」" - vim.g.mkdp_filetypes = { "markdown" } - end, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/markdown.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/markdown.lua deleted file mode 100644 index 1ec7402..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/markdown.lua +++ /dev/null @@ -1,19 +0,0 @@ --- ================================================================================================ --- TITLE: markdown.nvim --- ABOUT: Markdown editing enhancements (tables, checkboxes, lists) --- LINKS: markdown.nvim https://github.com/tadmccorkle/markdown.nvim --- ================================================================================================ -return { - "tadmccorkle/markdown.nvim", - ft = "markdown", - opts = { - -- Checkbox options - checkbox = { - enabled = true, - }, - -- Table options - table = { - enabled = true, - }, - }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/mini-nvim.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/mini-nvim.lua deleted file mode 100644 index 1fa830f..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/mini-nvim.lua +++ /dev/null @@ -1,36 +0,0 @@ --- ================================================================================================ --- TITLE : mini.nvim --- LINKS : --- > github : https://github.com/echasnovski/mini.nvim --- ABOUT : Library of 40+ independent Lua modules. --- ================================================================================================ - -return { - { 'echasnovski/mini.ai', version = false, event = 'VeryLazy', opts = {} }, - { 'echasnovski/mini.comment', version = false, event = 'VeryLazy', opts = {} }, - { 'echasnovski/mini.move', version = false, event = 'VeryLazy', opts = {} }, - { 'echasnovski/mini.surround', version = false, event = 'VeryLazy', opts = {} }, - { 'echasnovski/mini.cursorword', version = false, event = 'VeryLazy', opts = {} }, - { 'echasnovski/mini.pairs', version = false, event = 'VeryLazy', opts = {} }, - { 'echasnovski/mini.trailspace', version = false, event = 'VeryLazy', opts = {} }, - -- Set up mini icons and make it act as web-dev icons - { - 'nvim-mini/mini.icons', - lazy = true, - opts = { - file = { - ['.keep'] = { glyph = '󰊢', hl = 'MiniIconsGrey' }, - ['devcontainer.json'] = { glyph = '', hl = 'MiniIconsAzure' }, - }, - filetype = { - dotenv = { glyph = '', hl = 'MiniIconsYellow' }, - }, - }, - init = function() - package.preload['nvim-web-devicons'] = function() - require('mini.icons').mock_nvim_web_devicons() - return package.loaded['nvim-web-devicons'] - end - end, - }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/noice.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/noice.lua deleted file mode 100644 index 70fd82e..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/noice.lua +++ /dev/null @@ -1,31 +0,0 @@ --- ================================================================================================ --- TITLE: noice.nvim --- ABOUT: Displays cmdline and events in popup windows --- LINKS: noice.nvim https://github.com/folke/noice.nvim --- nui.nvim https://github.com/MunifTanjim/nui.nvim --- nvim-notify https://github.com/rcarriga/nvim-notify --- ================================================================================================ -return { - "folke/noice.nvim", - event = "VeryLazy", - opts = { - lsp = { - override = { - ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - ["vim.lsp.util.stylize_markdown"] = true, - ["cmp.entry.get_documentation"] = true, - }, - }, - presets = { - bottom_search = true, -- use a classic bottom cmdline for search - command_palette = true, -- position the cmdline and popupmenu together - long_message_to_split = true, -- long messages will be sent to a split - inc_rename = false, -- enables an input dialog for inc-rename - lsp_doc_border = false, -- add a border to hover docs and signature help - }, - }, - dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", - }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-dap.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-dap.lua deleted file mode 100644 index 420d9cf..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-dap.lua +++ /dev/null @@ -1,87 +0,0 @@ --- ================================================================================================ --- TITLE : nvim-dap --- ABOUT : Debug Adapter Protocol client implementation for Neovim --- -- LINKS : --- > github :https://github.com/mfussenegger/nvim-dap --- > github :https://github.com/rcarriga/nvim-dap-ui --- > github :https://github.com/nvim-neotest/nvim-nio --- > github :https://github.com/mfussenegger/nvim-dap-python --- ================================================================================================ - - --- Set up icons --- stylua: ignore start -local icons = { - Stopped = { '', 'DiagnosticWarn', 'DapStoppedLine' }, - Breakpoint = '', - BreakpointCondition = '', - BreakpointRejected = { '', 'DiagnosticError' }, - LogPoint = '󰚃', -} -for name, sign in pairs(icons) do - sign = type(sign) == 'table' and sign or { sign } - vim.fn.sign_define('Dap' .. name, { - text = sign[1] --[[@as string]] .. ' ', - texthl = sign[2] or 'DiagnosticInfo', - linehl = sign[3], - numhl = sign[3], - }) -end --- stylua: ignore end - --- Debugging setup -return { - { - 'mfussenegger/nvim-dap', - cmd = { - 'DapContinue', - 'DapStepOver', - 'DapStepInto', - 'DapStepOut', - 'DapToggleBreakpoint', - }, - dependencies = { - 'rcarriga/nvim-dap-ui', - 'nvim-neotest/nvim-nio', - }, - keys = { - -- stylua: ignore start - { 'dt', function() require('dap').toggle_breakpoint() end, desc = 'Debug Toggle Breakpoint' }, - { 'ds', function() require('dap').continue() end, desc = 'Debug Start' }, - { 'dc', function() require('dapui').close() end, desc = 'Debug Close' }, - { 'dn', function() require('dap').step_over() end, desc = 'Debug Step Next' }, - { 'di', function() require('dap').step_into() end, desc = 'Debug Step Into' }, - { 'do', function() require('dap').step_out() end, desc = 'Debug Step Out' }, - -- stylua: ignore end - }, - config = function() - local dap = require 'dap' - local dapui = require 'dapui' - - dapui.setup() -- Set up dapui - - dap.listeners.after.event_initialized['dapui_config'] = function() - dapui.open() - end - - dap.listeners.before.event_terminated['dapui_config'] = function() - dapui.close() - end - - dap.listeners.before.event_exited['dapui_config'] = function() - dapui.close() - end - end, - }, - { - 'mfussenegger/nvim-dap-python', - ft = 'python', - dependencies = { - 'mfussenegger/nvim-dap', - }, - config = function() - local path = '~/.local/share/nvim/mason/packages/debugpy/venv/bin/python' - require('dap-python').setup(path) - end, - }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lint.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lint.lua deleted file mode 100644 index d879ab9..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lint.lua +++ /dev/null @@ -1,27 +0,0 @@ --- ================================================================================================ --- TITLE : nvim lint --- ABOUT : For code linting --- LINKS : nvim-lint.nvim https://github.com/mfussenegger/nvim-lint --- ================================================================================================ - -return { - 'mfussenegger/nvim-lint', - config = function() - require('lint').linters_by_ft = { - javascript = { 'eslint_d' }, - typescript = { 'eslint_d' }, - lua = { 'luacheck' }, - c = { 'cpplint' }, - cpp = { 'cpplint' }, - rust = { 'clippy' }, - python = { 'ruff' }, - } - - -- Lint on save - vim.api.nvim_create_autocmd({ 'BufWritePost' }, { - callback = function() - require('lint').try_lint() - end, - }) - end, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lspconfig.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lspconfig.lua deleted file mode 100644 index d1e6d5a..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lspconfig.lua +++ /dev/null @@ -1,38 +0,0 @@ --- ================================================================================================ --- TITLE : nvim-lspconfig --- ABOUT : Quickstart configurations for the built-in Neovim LSP client. --- LINKS : --- > github : https://github.com/neovim/nvim-lspconfig --- > mason.nvim (dep) : https://github.com/mason-org/mason.nvim --- > blink.cmp (dep) : https://github.com/saghen/blink.cmp --- ================================================================================================ - -return { - 'neovim/nvim-lspconfig', - event = { 'BufReadPre', 'BufNewFile' }, - dependencies = { - -- LSP/DAP/Linter installer & manager - { - 'mason-org/mason.nvim', - opts = { - PATH = 'prepend', - ui = { - icons = { - package_pending = ' ', - package_installed = ' ', - package_uninstalled = ' ', - }, - }, - max_concurrent_installers = 10, - }, - config = function(_, opts) - require('mason').setup(opts) - end, - }, - 'saghen/blink.cmp', -- Allows extra capabilities provided by blink.cmp - }, - config = function() - require('utils.diagnostics').setup() - require 'servers' - end, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-treesitter.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-treesitter.lua deleted file mode 100644 index 6690b8d..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/nvim-treesitter.lua +++ /dev/null @@ -1,110 +0,0 @@ --- ================================================================================================ --- TITLE : nvim-treesitter --- ABOUT : Treesitter configurations and abstraction layer for Neovim. --- LINKS : --- > nvim-treesitter : https://github.com/nvim-treesitter/nvim-treesitter --- > github : https://github.com/nvim-treesitter/nvim-treesitter-textobjects (deps) --- ================================================================================================ - -return { - 'nvim-treesitter/nvim-treesitter', - branch = 'master', - event = { 'BufReadPost', 'BufNewFile' }, - build = ':TSUpdate', - dependencies = { - 'nvim-treesitter/nvim-treesitter-textobjects', - }, - config = function() - require('nvim-treesitter.configs') - .setup --[[@as any]] { - -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { - 'c', - 'cpp', - 'rust', - 'lua', - 'python', - 'javascript', - 'typescript', - 'vimdoc', - 'vim', - 'regex', - 'sql', - 'dockerfile', - 'toml', - 'json', - 'go', - 'gitignore', - 'yaml', - 'make', - 'cmake', - 'markdown', - 'markdown_inline', - 'bash', - 'fish', - 'tsx', - 'css', - 'html', - }, - - -- Autoinstall languages that are not installed - auto_install = false, - - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = '', - node_incremental = '', - scope_incremental = '', - node_decremental = '', - }, - }, - textobjects = { - select = { - enable = true, - lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim - keymaps = { - -- You can use the capture groups defined in textobjects.scm - ['aa'] = '@parameter.outer', - ['ia'] = '@parameter.inner', - ['af'] = '@function.outer', - ['if'] = '@function.inner', - ['ac'] = '@class.outer', - ['ic'] = '@class.inner', - }, - }, - move = { - enable = true, - set_jumps = true, -- whether to set jumps in the jumplist - goto_next_start = { - [']m'] = '@function.outer', - [']]'] = '@class.outer', - }, - goto_next_end = { - [']M'] = '@function.outer', - [']['] = '@class.outer', - }, - goto_previous_start = { - ['[m'] = '@function.outer', - ['[['] = '@class.outer', - }, - goto_previous_end = { - ['[M'] = '@function.outer', - ['[]'] = '@class.outer', - }, - }, - swap = { - enable = true, - swap_next = { - ['a'] = '@parameter.inner', - }, - swap_previous = { - ['A'] = '@parameter.inner', - }, - }, - }, - } - end, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/persistance.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/persistance.lua deleted file mode 100644 index 061f71a..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/persistance.lua +++ /dev/null @@ -1,19 +0,0 @@ --- ================================================================================================ --- TITLE : persistence.nvim --- ABOUT : Session manager for neovim --- LINKS : --- > github: https://github.com/folke/persistence.nvim --- ================================================================================================ - -return { - 'folke/persistence.nvim', - event = 'BufReadPre', - opts = {}, - -- stylua: ignore - keys = { - { "qs", function() require("persistence").load() end, desc = "Restore Session" }, - { "qS", function() require("persistence").select() end,desc = "Select Session" }, - { "ql", function() require("persistence").load({ last = true }) end, desc = "Restore Last Session" }, - { "qd", function() require("persistence").stop() end, desc = "Don't Save Current Session" }, - }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/snacks.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/snacks.lua deleted file mode 100644 index 5c552f1..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/snacks.lua +++ /dev/null @@ -1,196 +0,0 @@ --- ================================================================================================ --- TITLE : snacks.nvim --- ABOUT : QoL plugins for nvim --- LINKS : --- > github: https://github.com/folke/snacks.nvim --- ================================================================================================ -return { - 'folke/snacks.nvim', - priority = 1000, - lazy = false, - ---@type snacks.Config - opts = { - bigfile = { enabled = true }, - dashboard = { - enabled = true, - preset = { - header = [[ -███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ -████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ -██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ -██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ -██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ -╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝]], - }, - sections = { - { section = 'header' }, - { section = 'keys', gap = 1, padding = 1 }, - { section = 'startup', icon = '🚀 ' }, - }, - }, - explorer = { enabled = true }, - indent = { enabled = true }, - image = { enabled = true }, - input = { enabled = true }, - notifier = { - enabled = true, - timeout = 3000, - }, - picker = { - enabled = true, - files = { - cmd = { 'rg', '--files', '--hidden', '--glob', '!.git/*' }, - }, - }, - quickfile = { enabled = true }, - scope = { enabled = true }, - scroll = { enabled = true }, - statuscolumn = { enabled = true }, - words = { enabled = true }, - styles = { - notification = { - wo = { wrap = true }, -- Wrap notifications - }, - }, - }, - -- stylua: ignore start - keys = { - -- Top Pickers & Explorer - { "", function() Snacks.picker.smart() end, desc = "Smart Find Files" }, - { ",", function() Snacks.picker.buffers() end, desc = "Buffers" }, - { "/", function() Snacks.picker.grep() end, desc = "Grep" }, - { ":", function() Snacks.picker.command_history() end, desc = "Command History" }, - { "n", function() Snacks.picker.notifications() end, desc = "Notification History" }, - { "e", function() Snacks.explorer() end, desc = "File Explorer" }, - -- find - { "fb", function() Snacks.picker.buffers() end, desc = "Buffers" }, - { "fc", function() Snacks.picker.files({ cwd = vim.fn.stdpath("config") }) end, desc = "Find Config File" }, - { "ff", function() Snacks.picker.files() end, desc = "Find Files" }, - { "fg", function() Snacks.picker.git_files() end, desc = "Find Git Files" }, - { "fp", function() Snacks.picker.projects() end, desc = "Projects" }, - { "fr", function() Snacks.picker.recent() end, desc = "Recent" }, - -- git - { "gb", function() Snacks.picker.git_branches() end, desc = "Git Branches" }, - { "gl", function() Snacks.picker.git_log() end, desc = "Git Log" }, - { "gL", function() Snacks.picker.git_log_line() end, desc = "Git Log Line" }, - { "gs", function() Snacks.picker.git_status() end, desc = "Git Status" }, - { "gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" }, - { "gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (Hunks)" }, - { "gf", function() Snacks.picker.git_log_file() end, desc = "Git Log File" }, - -- gh - { "gi", function() Snacks.picker.gh_issue() end, desc = "GitHub Issues (open)" }, - { "gI", function() Snacks.picker.gh_issue({ state = "all" }) end, desc = "GitHub Issues (all)" }, - { "gp", function() Snacks.picker.gh_pr() end, desc = "GitHub Pull Requests (open)" }, - { "gP", function() Snacks.picker.gh_pr({ state = "all" }) end, desc = "GitHub Pull Requests (all)" }, - -- Grep - { "sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" }, - { "sB", function() Snacks.picker.grep_buffers() end, desc = "Grep Open Buffers" }, - { "sg", function() Snacks.picker.grep() end, desc = "Grep" }, - { "sw", function() Snacks.picker.grep_word() end, desc = "Visual selection or word", mode = { "n", "x" } }, - -- search - { 's"', function() Snacks.picker.registers() end, desc = "Registers" }, - { 's/', function() Snacks.picker.search_history() end, desc = "Search History" }, - { "sa", function() Snacks.picker.autocmds() end, desc = "Autocmds" }, - { "sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" }, - { "sc", function() Snacks.picker.command_history() end, desc = "Command History" }, - { "sC", function() Snacks.picker.commands() end, desc = "Commands" }, - { "sd", function() Snacks.picker.diagnostics() end, desc = "Diagnostics" }, - { "sD", function() Snacks.picker.diagnostics_buffer() end, desc = "Buffer Diagnostics" }, - { "sh", function() Snacks.picker.help() end, desc = "Help Pages" }, - { "sH", function() Snacks.picker.highlights() end, desc = "Highlights" }, - { "si", function() Snacks.picker.icons() end, desc = "Icons" }, - { "sj", function() Snacks.picker.jumps() end, desc = "Jumps" }, - { "sk", function() Snacks.picker.keymaps() end, desc = "Keymaps" }, - { "sl", function() Snacks.picker.loclist() end, desc = "Location List" }, - { "sm", function() Snacks.picker.marks() end, desc = "Marks" }, - { "sM", function() Snacks.picker.man() end, desc = "Man Pages" }, - { "sp", function() Snacks.picker.lazy() end, desc = "Search for Plugin Spec" }, - { "sq", function() Snacks.picker.qflist() end, desc = "Quickfix List" }, - { "sR", function() Snacks.picker.resume() end, desc = "Resume" }, - { "su", function() Snacks.picker.undo() end, desc = "Undo History" }, - { "uC", function() Snacks.picker.colorschemes() end, desc = "Colorschemes" }, - -- LSP - { "gd", function() Snacks.picker.lsp_definitions() end, desc = "Goto Definition" }, - { "gD", function() Snacks.picker.lsp_declarations() end, desc = "Goto Declaration" }, - { "gr", function() Snacks.picker.lsp_references() end, nowait = true, desc = "References" }, - { "gI", function() Snacks.picker.lsp_implementations() end, desc = "Goto Implementation" }, - { "gy", function() Snacks.picker.lsp_type_definitions() end, desc = "Goto T[y]pe Definition" }, - { "gai", function() Snacks.picker.lsp_incoming_calls() end, desc = "C[a]lls Incoming" }, - { "gao", function() Snacks.picker.lsp_outgoing_calls() end, desc = "C[a]lls Outgoing" }, - { "ss", function() Snacks.picker.lsp_symbols() end, desc = "LSP Symbols" }, - { "sS", function() Snacks.picker.lsp_workspace_symbols() end, desc = "LSP Workspace Symbols" }, - -- Other - { "ps", function() Snacks.profiler.scratch() end, desc = "Profiler Scratch Bufer" }, - { "z", function() Snacks.zen() end, desc = "Toggle Zen Mode" }, - { "Z", function() Snacks.zen.zoom() end, desc = "Toggle Zoom" }, - { ".", function() Snacks.scratch() end, desc = "Toggle Scratch Buffer" }, - { "S", function() Snacks.scratch.select() end, desc = "Select Scratch Buffer" }, - { "n", function() Snacks.notifier.show_history() end, desc = "Notification History" }, - { "bd", function() Snacks.bufdelete() end, desc = "Delete Buffer" }, - { "cR", function() Snacks.rename.rename_file() end, desc = "Rename File" }, - { "gB", function() Snacks.gitbrowse() end, desc = "Git Browse", mode = { "n", "v" } }, - { "gg", function() Snacks.lazygit() end, desc = "Lazygit" }, - { "un", function() Snacks.notifier.hide() end, desc = "Dismiss All Notifications" }, - { "", function() Snacks.terminal() end, desc = "Toggle Terminal" }, - { "", function() Snacks.terminal() end, desc = "which_key_ignore" }, - { "]]", function() Snacks.words.jump(vim.v.count1) end, desc = "Next Reference", mode = { "n", "t" } }, - { "[[", function() Snacks.words.jump(-vim.v.count1) end, desc = "Prev Reference", mode = { "n", "t" } }, - { - "N", - desc = "Neovim News", - function() - Snacks.win({ - file = vim.api.nvim_get_runtime_file("doc/news.txt", false)[1], - width = 0.6, - height = 0.6, - wo = { - spell = false, - wrap = false, - signcolumn = "yes", - statuscolumn = " ", - conceallevel = 3, - }, - }) - end, - } - }, - -- stylua: ignore end - init = function() - vim.api.nvim_create_autocmd('User', { - pattern = 'VeryLazy', - callback = function() - -- Setup some globals for debugging (lazy-loaded) - _G.dd = function(...) - Snacks.debug.inspect(...) - end - _G.bt = function() - Snacks.debug.backtrace() - end - - -- Override print to use snacks for `:=` command - if vim.fn.has 'nvim-0.11' == 1 then - vim._print = function(_, ...) - dd(...) - end - else - vim.print = _G.dd - end - - -- Create some toggle mappings - Snacks.toggle.profiler():map 'pp' - Snacks.toggle.profiler_highlights():map 'ph' - Snacks.toggle.option('spell', { name = 'Spelling' }):map 'us' - Snacks.toggle.option('wrap', { name = 'Wrap' }):map 'uw' - Snacks.toggle.option('relativenumber', { name = 'Relative Number' }):map 'uL' - Snacks.toggle.diagnostics():map 'ud' - Snacks.toggle.line_number():map 'ul' - Snacks.toggle.option('conceallevel', { off = 0, on = vim.o.conceallevel > 0 and vim.o.conceallevel or 2 }):map 'uc' - Snacks.toggle.treesitter():map 'uT' - Snacks.toggle.option('background', { off = 'light', on = 'dark', name = 'Dark Background' }):map 'ub' - Snacks.toggle.inlay_hints():map 'uh' - Snacks.toggle.indent():map 'ug' - Snacks.toggle.dim():map 'uD' - end, - }) - end, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/todo-comments.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/todo-comments.lua deleted file mode 100644 index e19dfd0..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/todo-comments.lua +++ /dev/null @@ -1,21 +0,0 @@ --- ================================================================================================ --- TITLE : todo-comments.nvim --- LINKS : --- > github : https://github.com/lewis6991/gitsigns.nvim --- ABOUT : To highlight and search for todo comments like TODO, HACK, BUG in your code base. --- ================================================================================================ -return { - 'folke/todo-comments.nvim', - cmd = { 'TodoTrouble', 'TodoTelescope' }, - event = { 'BufReadPre', 'BufNewFile' }, - opts = {}, - -- stylua: ignore - keys = { - { "]t", function() require("todo-comments").jump_next() end, desc = "Next Todo Comment" }, - { "[t", function() require("todo-comments").jump_prev() end, desc = "Previous Todo Comment" }, - { "xt", "Trouble todo toggle", desc = "Todo (Trouble)" }, - { "xT", "Trouble todo toggle filter = {tag = {TODO,FIX,FIXME}}", desc = "Todo/Fix/Fixme (Trouble)" }, - { "st", "TodoTelescope", desc = "Todo" }, - { "sT", "TodoTelescope keywords=TODO,FIX,FIXME", desc = "Todo/Fix/Fixme" }, - }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/plugins/which-key.lua b/modules/home/editors/bugsvim-nvim/lua/plugins/which-key.lua deleted file mode 100644 index 71d5931..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/plugins/which-key.lua +++ /dev/null @@ -1,23 +0,0 @@ --- ================================================================================================ --- TITLE : which-key --- ABOUT : WhichKey helps you remember your Neovim keymaps, by showing keybindings as you type. --- LINKS : --- > github : https://github.com/folke/which-key.nvim --- ================================================================================================ - -return { - 'folke/which-key.nvim', - event = 'VeryLazy', - opts = { - preset = 'helix', - }, - keys = { - { - '?', - function() - require('which-key').show { global = false } - end, - desc = 'Buffer Local Keymaps (which-key)', - }, - }, -} diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/bashls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/bashls.lua deleted file mode 100644 index 2cc6f12..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/bashls.lua +++ /dev/null @@ -1,14 +0,0 @@ --- ================================================================================================ --- TITLE : bashls (Bash Language Server) LSP Setup --- LINKS : --- > github: https://github.com/bash-lsp/bash-language-server --- ================================================================================================ - ---- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) ---- @return nil -return function(capabilities) - vim.lsp.config('bashls', { - capabilities = capabilities, - filetypes = { 'sh', 'bash', 'zsh' }, - }) -end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/clangd.lua b/modules/home/editors/bugsvim-nvim/lua/servers/clangd.lua deleted file mode 100644 index 99a6b1b..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/clangd.lua +++ /dev/null @@ -1,18 +0,0 @@ --- ================================================================================================ --- TITLE : clangd (C/C++ Language Server) LSP Setup --- LINKS : --- > website: https://clangd.llvm.org/ --- ================================================================================================ - ---- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) ---- @return nil -return function(capabilities) - vim.lsp.config('clangd', { - capabilities = capabilities, - cmd = { - 'clangd', - '--offset-encoding=utf-16', - }, - filetypes = { 'c', 'cpp' }, - }) -end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/cssls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/cssls.lua deleted file mode 100644 index da0548d..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/cssls.lua +++ /dev/null @@ -1,16 +0,0 @@ --- ================================================================================================ --- TITLE : cssls (CSS Language Server) LSP Setup --- ABOUT : Language server for CSS stylesheets --- LINKS : --- > github: https://github.com/hrsh7th/vscode-langservers-extracted --- ================================================================================================ - ---- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) ---- @return nil -return function(capabilities) - vim.lsp.config('cssls', { - cmd = { 'css-languageserver', '--stdio' }, - capabilities = capabilities, - filetypes = { 'css', 'scss', 'less' }, - }) -end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/html.lua b/modules/home/editors/bugsvim-nvim/lua/servers/html.lua deleted file mode 100644 index bad7276..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/html.lua +++ /dev/null @@ -1,16 +0,0 @@ --- ================================================================================================ --- TITLE : html (HTML Language Server) LSP Setup --- ABOUT : Language server for HTML markup --- LINKS : --- > github: https://github.com/hrsh7th/vscode-langservers-extracted --- ================================================================================================ - ---- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) ---- @return nil -return function(capabilities) - vim.lsp.config('html', { - cmd = { 'html-languageserver', '--stdio' }, - capabilities = capabilities, - filetypes = { 'html', 'templ' }, - }) -end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/hyprls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/hyprls.lua deleted file mode 100644 index 5ae0dcf..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/hyprls.lua +++ /dev/null @@ -1,16 +0,0 @@ --- ================================================================================================ --- TITLE : hyprls (Hyprland Language Server) LSP Setup --- ABOUT : Language server for Hyprland window manager configuration --- LINKS : --- > github: https://github.com/hyprwm/hyprland-protocols --- ================================================================================================ - ---- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) ---- @return nil -return function(capabilities) - vim.lsp.config('hyprls', { - cmd = { 'hyprls' }, - capabilities = capabilities, - filetypes = { 'hyprland' }, - }) -end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/init.lua b/modules/home/editors/bugsvim-nvim/lua/servers/init.lua deleted file mode 100644 index 45571aa..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/init.lua +++ /dev/null @@ -1,33 +0,0 @@ --- Get default LSP capabilities -local default_capabilities = vim.lsp.protocol.make_client_capabilities() - --- Merge with blink.cmp capabilities -local capabilities = require('blink.cmp').get_lsp_capabilities(default_capabilities) - --- Language Server Protocol (LSP) -require 'servers.lua_ls'(capabilities) -require 'servers.pyright'(capabilities) -require 'servers.ts_ls'(capabilities) -require 'servers.tailwindcss'(capabilities) -require 'servers.clangd'(capabilities) -require 'servers.bashls'(capabilities) -require 'servers.rust_analyzer'(capabilities) -require 'servers.html'(capabilities) -require 'servers.cssls'(capabilities) -require 'servers.nil_ls'(capabilities) -require 'servers.hyprls'(capabilities) - --- Enable lsp servers -vim.lsp.enable { - 'lua_ls', - 'ts_ls', - 'tailwindcss', - 'clangd', - 'bashls', - 'rust_analyzer', - 'pyright', - 'html', - 'cssls', - 'nil_ls', - 'hyprls', -} diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/lua_ls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/lua_ls.lua deleted file mode 100644 index d9cf9d3..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/lua_ls.lua +++ /dev/null @@ -1,27 +0,0 @@ --- ================================================================================================ --- TITLE : lua_ls (Lua Language Server) LSP Setup --- LINKS : --- > github: https://github.com/LuaLS/lua-language-server --- ================================================================================================ - ---- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) ---- @return nil -return function(capabilities) - vim.lsp.config('lua_ls', { - cmd = { 'lua-language-server' }, - capabilities = capabilities, - settings = { - Lua = { - diagnostics = { - globals = { 'vim' }, - }, - workspace = { - library = { - vim.fn.expand '$VIMRUNTIME/lua', - vim.fn.expand '$XDG_CONFIG_HOME' .. '/nvim/lua', - }, - }, - }, - }, - }) -end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/nil_ls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/nil_ls.lua deleted file mode 100644 index 85118f0..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/nil_ls.lua +++ /dev/null @@ -1,16 +0,0 @@ --- ================================================================================================ --- TITLE : nil_ls (Nix Language Server) LSP Setup --- ABOUT : Language server for Nix package manager --- LINKS : --- > github: https://github.com/oxalica/nil --- ================================================================================================ - ---- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) ---- @return nil -return function(capabilities) - vim.lsp.config('nil_ls', { - cmd = { 'nil' }, - capabilities = capabilities, - filetypes = { 'nix' }, - }) -end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/pyright.lua b/modules/home/editors/bugsvim-nvim/lua/servers/pyright.lua deleted file mode 100644 index 0a8303a..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/pyright.lua +++ /dev/null @@ -1,24 +0,0 @@ --- ================================================================================================ --- TITLE : pyright (Python Language Server) LSP Setup --- LINKS : --- > github: https://github.com/microsoft/pyright --- ================================================================================================ - ---- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) ---- @return nil This function doesn't return a value, it configures the LSP server -return function(capabilities) - vim.lsp.config('pyright', { - capabilities = capabilities, - settings = { - pyright = { - disableOrganizeImports = false, - analysis = { - useLibraryCodeForTypes = true, - autoSearchPaths = true, - diagnosticMode = 'workspace', - autoImportCompletions = true, - }, - }, - }, - }) -end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/rust_analyzer.lua b/modules/home/editors/bugsvim-nvim/lua/servers/rust_analyzer.lua deleted file mode 100644 index cef83c5..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/rust_analyzer.lua +++ /dev/null @@ -1,21 +0,0 @@ --- ================================================================================================ --- TITLE : rust_analyzer LSP Setup --- LINKS : --- > github: https://github.com/rust-analyzer/rust-analyzer --- ================================================================================================ - ---- @param capabilities table LSP client capabilities (typically from bink-cmp or similar) ---- @return nil -return function(capabilities) - vim.lsp.config('rust_analyzer', { - cmd = { 'rust-analyzer' }, - filetypes = { 'rust' }, - root_markers = { 'Cargo.toml', 'rust-project.json', '.git' }, - capabilities = capabilities, - settings = { - ['rust-analyzer'] = { - cargo = { allFeatures = true }, - }, - }, - }) -end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/tailwindcss.lua b/modules/home/editors/bugsvim-nvim/lua/servers/tailwindcss.lua deleted file mode 100644 index 735c630..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/tailwindcss.lua +++ /dev/null @@ -1,21 +0,0 @@ --- ================================================================================================ --- TITLE : tailwindcss LSP Setup --- LINKS : --- > github: https://github.com/tailwindlabs/tailwindcss-intellisense --- ================================================================================================ - ---- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) ---- @return nil -return function(capabilities) - vim.lsp.config('tailwindcss', { - capabilities = capabilities, - filetypes = { - 'javascript', - 'javascriptreact', - 'typescript', - 'typescriptreact', - 'vue', - 'svelte', - }, - }) -end diff --git a/modules/home/editors/bugsvim-nvim/lua/servers/ts_ls.lua b/modules/home/editors/bugsvim-nvim/lua/servers/ts_ls.lua deleted file mode 100644 index c9ca67d..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/servers/ts_ls.lua +++ /dev/null @@ -1,47 +0,0 @@ --- ================================================================================================ --- TITLE : ts_ls (TypeScript Language Server) LSP Setup --- LINKS : --- > github: https://github.com/typescript-language-server/typescript-language-server --- ================================================================================================ - ---- @param capabilities table LSP client capabilities (typically from blink-cmp or similar) ---- @return nil -return function(capabilities) - vim.lsp.config('ts_ls', { - capabilities = capabilities, - filetypes = { - 'typescript', - 'javascript', - 'typescriptreact', - 'javascriptreact', - }, - settings = { - typescript = { - indentStyle = 'space', - indentSize = 2, - inlayHints = { - includeInlayParameterNameHints = 'literal', - includeInlayParameterNameHintsWhenArgumentMatchesName = false, - includeInlayFunctionParameterTypeHints = true, - includeInlayVariableTypeHints = false, - includeInlayPropertyDeclarationTypeHints = true, - includeInlayFunctionLikeReturnTypeHints = true, - includeInlayEnumMemberValueHints = true, - }, - }, - javascript = { - indentStyle = 'space', - indentSize = 2, - inlayHints = { - includeInlayParameterNameHints = 'all', - includeInlayParameterNameHintsWhenArgumentMatchesName = false, - includeInlayFunctionParameterTypeHints = true, - includeInlayVariableTypeHints = true, - includeInlayPropertyDeclarationTypeHints = true, - includeInlayFunctionLikeReturnTypeHints = true, - includeInlayEnumMemberValueHints = true, - }, - }, - }, - }) -end diff --git a/modules/home/editors/bugsvim-nvim/lua/utils/diagnostics.lua b/modules/home/editors/bugsvim-nvim/lua/utils/diagnostics.lua deleted file mode 100644 index 9f5a558..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/utils/diagnostics.lua +++ /dev/null @@ -1,47 +0,0 @@ -local M = {} - -local diagnostic_signs = { - Error = " ", - Warn = " ", - Hint = "", - Info = "", -} - -M.setup = function() - vim.diagnostic.config({ - -- Show signs in the gutter - signs = { - text = { - [vim.diagnostic.severity.ERROR] = diagnostic_signs.Error, - [vim.diagnostic.severity.WARN] = diagnostic_signs.Warn, - [vim.diagnostic.severity.INFO] = diagnostic_signs.Info, - [vim.diagnostic.severity.HINT] = diagnostic_signs.Hint, - }, - numhl = { - [vim.diagnostic.severity.ERROR] = "DiagnosticSignError", - [vim.diagnostic.severity.WARN] = "DiagnosticSignWarn", - [vim.diagnostic.severity.INFO] = "DiagnosticSignInfo", - [vim.diagnostic.severity.HINT] = "DiagnosticSignHint", - }, - linehl = false, - }, - -- Show virtual text next to error (inline diagnostics) - virtual_text = { - prefix = '●', - spacing = 2, - severity = { - min = vim.diagnostic.severity.HINT, -- Show all severity levels - }, - }, - -- Underline errors - underline = true, - -- Show diagnostic in floating window on hover - float = { - source = "always", - }, - severity_sort = true, - update_in_insert = false, - }) -end - -return M diff --git a/modules/home/editors/bugsvim-nvim/lua/utils/lsp.lua b/modules/home/editors/bugsvim-nvim/lua/utils/lsp.lua deleted file mode 100644 index 576856d..0000000 --- a/modules/home/editors/bugsvim-nvim/lua/utils/lsp.lua +++ /dev/null @@ -1,44 +0,0 @@ -local M = {} - -M.on_attach = function(event) - local client = vim.lsp.get_client_by_id(event.data.client_id) - if not client then - return - end - - local bufnr = event.buf - local keymap = vim.keymap.set - local function opts(desc) - return { noremap = true, silent = true, buffer = bufnr, desc = '[LSP]:' .. desc } - end - - -- stylua: ignore start - -- Native LSP Keymaps - keymap("n", "gd", vim.lsp.buf.definition, opts("Go to definition")) - keymap("n", "gS", function() vim.cmd("vsplit") vim.lsp.buf.definition() end, opts("Go to definition (split)")) - keymap("n", "gD", vim.lsp.buf.declaration, opts("Go to declaration")) - keymap("n", "ca", vim.lsp.buf.code_action, opts("Code action")) - keymap("n", "rn", vim.lsp.buf.rename, opts("Rename symbol")) - keymap("n", "D", vim.diagnostic.open_float, opts("Open diagnostics float")) - keymap("n", "cd", function() vim.diagnostic.open_float(nil, { scope = "cursor" }) end, opts("Cursor diagnostics")) - keymap("n", "[d", function () vim.diagnostic.jump({count = -1}) end, opts("Previous diagnostic")) - keymap("n", "]d", function () vim.diagnostic.jump({count = 1}) end, opts("Next diagnostic")) - keymap("n", "K", vim.lsp.buf.hover, opts("Hover documentation")) - -- stylua: ignore end - - -- Organize Imports (if supported) - if client:supports_method('textDocument/codeAction', bufnr) then - keymap('n', 'oi', function() - vim.lsp.buf.code_action { - context = { only = { 'source.organizeImports' }, diagnostics = {} }, - apply = true, - bufnr = bufnr, - } - vim.defer_fn(function() - vim.lsp.buf.format { bufnr = bufnr } - end, 50) - end, opts 'Organize imports') - end -end - -return M diff --git a/modules/home/editors/bugsvim.nix b/modules/home/editors/bugsvim.nix deleted file mode 100644 index 3485c2e..0000000 --- a/modules/home/editors/bugsvim.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - # Local bugsvim config directory bundled in this repo - bugsvimSrc = ./bugsvim-nvim; -in { - # Disable HM's Neovim module so it doesn't generate ~/.config/nvim/* - programs.neovim = lib.mkForce { - enable = false; - }; - - # Install Neovim + required tools so lazy.nvim can manage plugins/config - home.packages = with pkgs; [ - neovim - - # Language Servers - lua-language-server - pyright - typescript-language-server - tailwindcss-language-server - clang-tools - bash-language-server - rust-analyzer - vscode-langservers-extracted # html, css, json, eslint - nil # Nix LSP - hyprls - stdenv.cc - - # Formatters - stylua - ruff - prettierd - shfmt - alejandra - - # Linters - eslint_d - luajitPackages.luacheck - cpplint - - # Additional tools - ripgrep - fd - tree-sitter - git - gnumake - ]; - - # Ensure writable config and clear HM symlink remnants during transitions - home.activation.bugsvimSetup = lib.hm.dag.entryAfter ["writeBoundary"] '' - set -eu - UNDO_DIR="$HOME/.local/share/nvim/undodir" - if [ ! -d "$UNDO_DIR" ]; then - $DRY_RUN_CMD mkdir -p "$UNDO_DIR" - echo "Created NeoVim undo directory at $UNDO_DIR" - fi - - # Remove HM symlink remnants from nixvim/nvf (if present) - if [ -L "$HOME/.local/share/nvim/lua" ]; then - $DRY_RUN_CMD rm -rf "$HOME/.local/share/nvim/lua" - fi - - # Copy bugsvim config into ~/.config/nvim (writable) so lazy.nvim can manage updates - SRC=${bugsvimSrc} - DEST="$HOME/.config/nvim" - $DRY_RUN_CMD rm -rf "$DEST" - $DRY_RUN_CMD mkdir -p "$DEST" - $DRY_RUN_CMD cp -r "$SRC"/. "$DEST"/ - $DRY_RUN_CMD chmod -R u+rwX "$DEST" - - # Lazy.nvim will self-bootstrap on first nvim run - # The init.lua handles automatic cloning if lazy.nvim is not present - ''; -} From 6027ada4d1849ad4a637c632c2047401558cecc9 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Sat, 25 Apr 2026 03:21:01 -0400 Subject: [PATCH 218/232] 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 --- CHANGELOG.md | 5 +++ flake.lock | 60 +++++++++++++++--------------- modules/core/boot.nix | 2 +- modules/home/hyprland/hyprland.nix | 2 +- 4 files changed, 37 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfa50ea..28bb55d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ # 🚀 **Current Release - ZaneyOS v2.6.1** +- 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` diff --git a/flake.lock b/flake.lock index d6ea328..c15ba0e 100644 --- a/flake.lock +++ b/flake.lock @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1776373306, - "narHash": "sha256-iAJIzHngGZeLIkjzuuWI6VBsYJ1n89a/Esq0m8R1vjs=", + "lastModified": 1777086106, + "narHash": "sha256-hlNpIN18pw3xo34Lsrp6vAMUPn0aB/zFBqL0QXI1Pmk=", "owner": "nix-community", "repo": "home-manager", - "rev": "d401492e2acd4fea42f7705a3c266cea739c9c36", + "rev": "5826802354a74af18540aef0b01bc1320f82cc17", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1774991950, - "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1768214250, - "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", + "lastModified": 1776882296, + "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=", "owner": "feel-co", "repo": "ndg", - "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", + "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e", "type": "github" }, "original": { @@ -430,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1776877367, + "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1776350339, - "narHash": "sha256-Rl+tnpvdpf66e/3m+LPNzUoebV3jpiJz7oMxas8FB3I=", + "lastModified": 1777080231, + "narHash": "sha256-gpx+FmYpBAO4toBmQzcmdR6gVvVxT969UlB7Xz2jbFA=", "owner": "nix-community", "repo": "nixvim", - "rev": "4f75992439d3d554a3681880510e4b645ca2d15b", + "rev": "f6fd130ad3b95c3c039fd7f882825c49f7e70bde", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1776302695, - "narHash": "sha256-xZc9o1JLQpmWn2Dqui323+Tq2Ai4sSdtdvbFZCs4qLo=", + "lastModified": 1777079905, + "narHash": "sha256-TvYEXwkZnRFQRuFyyqTNSfPnU2tMdhtiBOXSk2AWLJA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a7c724181fca5d1aff2d47b18fa733504cfdbda2", + "rev": "a50c92167c8d438000270f7eca36f6eea74f388e", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775957204, - "narHash": "sha256-d4CVRtAty2GzDYXx4xYQmR+nlOjjKovyprQfZhgLckU=", + "lastModified": 1776585574, + "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "68e82fe34c68ee839a9c37e3466820e266af0c86", + "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1776376181, - "narHash": "sha256-N/I4lxWjes7E8n4NEOYaNxxvJ9db+RKHJSH8oDdqR8o=", + "lastModified": 1777062815, + "narHash": "sha256-RWwgP/R2nIcyOTPYJdApqvj/dVc4+n/4kOCNlRnfb7U=", "owner": "notashelf", "repo": "nvf", - "rev": "029ca6d34ad8d830afb56a9963e4baed53848da6", + "rev": "41394699260ffc533a688d0ca5b8888bd5e64233", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1776170745, - "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=", + "lastModified": 1776893932, + "narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=", "owner": "danth", "repo": "stylix", - "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9", + "rev": "84971726c7ef0bb3669a5443e151cc226e65c518", "type": "github" }, "original": { @@ -844,11 +844,11 @@ ] }, "locked": { - "lastModified": 1775699406, - "narHash": "sha256-YpDALorsidLjSyS5ozvsNI7Gz/bkmDs/ls/9oHKPv40=", + "lastModified": 1777058936, + "narHash": "sha256-H7XdcjRBA4UROm6KNi+mR+E22LW8vb0jRfoz1GHpPCo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b05c87c1a474cdd6979a4e5f7058edf4073554df", + "rev": "9027d5218172c3aa2060d43e599d3304c9c13bc0", "type": "github" }, "original": { diff --git a/modules/core/boot.nix b/modules/core/boot.nix index 47011ff..51a5da5 100644 --- a/modules/core/boot.nix +++ b/modules/core/boot.nix @@ -4,7 +4,7 @@ ... }: { boot = { - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = pkgs.linuxPackages_latest; kernelModules = ["v4l2loopback"]; extraModulePackages = [config.boot.kernelPackages.v4l2loopback]; kernel.sysctl = {"vm.max_map_count" = 2147483642;}; diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index e99709c..635c6c7 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -137,7 +137,7 @@ in { disable_hyprland_logo = true; disable_splash_rendering = true; enable_swallow = false; - vfr = true; # Variable Frame Rate + # vfr = true; # Variable Frame Rate Not supported post v0.54.3 vrr = 2; # Variable Refresh Rate Might need to set to 0 for NVIDIA/AQ_DRM_DEVICES # Screen flashing to black momentarily or going black when app is fullscreen # Try setting vrr to 0 From b7d06714bf0a679752b6a27181bf5e6b3c78b9a9 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 25 Apr 2026 04:06:46 -0400 Subject: [PATCH 219/232] Upd: latest kernel disable VFR in HL On branch zos-next-grub Your branch is up to date with 'origin/zos-next-grub'. Changes to be committed: modified: CHANGELOG.md modified: flake.lock modified: modules/core/boot.nix modified: modules/home/hyprland/hyprland.nix --- CHANGELOG.md | 7 ++++ flake.lock | 60 +++++++++++++++--------------- modules/core/boot.nix | 4 +- modules/home/hyprland/hyprland.nix | 2 +- 4 files changed, 40 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72a0e93..5b2cd8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ # 🚀 **Current Release - ZaneyOS v2.6.2** +#### 📅 **Updated: April 25th, 2026** + +- 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 diff --git a/flake.lock b/flake.lock index e30e4ce..59b844b 100644 --- a/flake.lock +++ b/flake.lock @@ -280,11 +280,11 @@ ] }, "locked": { - "lastModified": 1776454077, - "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=", + "lastModified": 1777086106, + "narHash": "sha256-hlNpIN18pw3xo34Lsrp6vAMUPn0aB/zFBqL0QXI1Pmk=", "owner": "nix-community", "repo": "home-manager", - "rev": "565e5349208fe7d0831ef959103c9bafbeac0681", + "rev": "5826802354a74af18540aef0b01bc1320f82cc17", "type": "github" }, "original": { @@ -302,11 +302,11 @@ ] }, "locked": { - "lastModified": 1774991950, - "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { @@ -338,11 +338,11 @@ ] }, "locked": { - "lastModified": 1768214250, - "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", + "lastModified": 1776882296, + "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=", "owner": "feel-co", "repo": "ndg", - "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", + "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1776877367, + "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1776452249, - "narHash": "sha256-tpCsY9kIEfcitiV3JwUqYTmxwewwZKQlZSNUBqb9kF0=", + "lastModified": 1777080231, + "narHash": "sha256-gpx+FmYpBAO4toBmQzcmdR6gVvVxT969UlB7Xz2jbFA=", "owner": "nix-community", "repo": "nixvim", - "rev": "698d17490e19e2e360a6ce49b1af9134d1c6eacd", + "rev": "f6fd130ad3b95c3c039fd7f882825c49f7e70bde", "type": "github" }, "original": { @@ -416,11 +416,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1776302695, - "narHash": "sha256-xZc9o1JLQpmWn2Dqui323+Tq2Ai4sSdtdvbFZCs4qLo=", + "lastModified": 1777079905, + "narHash": "sha256-TvYEXwkZnRFQRuFyyqTNSfPnU2tMdhtiBOXSk2AWLJA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a7c724181fca5d1aff2d47b18fa733504cfdbda2", + "rev": "a50c92167c8d438000270f7eca36f6eea74f388e", "type": "github" }, "original": { @@ -439,11 +439,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775957204, - "narHash": "sha256-d4CVRtAty2GzDYXx4xYQmR+nlOjjKovyprQfZhgLckU=", + "lastModified": 1776585574, + "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "68e82fe34c68ee839a9c37e3466820e266af0c86", + "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", "type": "github" }, "original": { @@ -491,11 +491,11 @@ ] }, "locked": { - "lastModified": 1776443141, - "narHash": "sha256-0GPSO7piciOuKYnTAvCFChlRM51HIYS8j1metFSHkAg=", + "lastModified": 1777062815, + "narHash": "sha256-RWwgP/R2nIcyOTPYJdApqvj/dVc4+n/4kOCNlRnfb7U=", "owner": "notashelf", "repo": "nvf", - "rev": "a2708696b1c3805bbde5b6292c214f56d3b2996d", + "rev": "41394699260ffc533a688d0ca5b8888bd5e64233", "type": "github" }, "original": { @@ -562,11 +562,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1776170745, - "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=", + "lastModified": 1776893932, + "narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=", "owner": "danth", "repo": "stylix", - "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9", + "rev": "84971726c7ef0bb3669a5443e151cc226e65c518", "type": "github" }, "original": { @@ -715,11 +715,11 @@ ] }, "locked": { - "lastModified": 1775699406, - "narHash": "sha256-YpDALorsidLjSyS5ozvsNI7Gz/bkmDs/ls/9oHKPv40=", + "lastModified": 1777058936, + "narHash": "sha256-H7XdcjRBA4UROm6KNi+mR+E22LW8vb0jRfoz1GHpPCo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b05c87c1a474cdd6979a4e5f7058edf4073554df", + "rev": "9027d5218172c3aa2060d43e599d3304c9c13bc0", "type": "github" }, "original": { diff --git a/modules/core/boot.nix b/modules/core/boot.nix index 733fe0d..0472628 100644 --- a/modules/core/boot.nix +++ b/modules/core/boot.nix @@ -9,8 +9,8 @@ in { boot = { kernelPackages = if isx86_64 - then pkgs.linuxPackages_zen - else pkgs.linuxPackages; + then pkgs.linuxPackages_latest + else pkgs.linuxPackages_zen; kernelModules = ["v4l2loopback"]; extraModulePackages = [config.boot.kernelPackages.v4l2loopback]; diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 56927fc..cee0bba 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -127,7 +127,7 @@ in { disable_hyprland_logo = true; disable_splash_rendering = true; enable_swallow = false; - vfr = true; # Variable Frame Rate + # vfr = true; # Variable Frame Rate Not supported post v0.54.3 vrr = 2; # Variable Refresh Rate Might need to set to 0 for NVIDIA/AQ_DRM_DEVICES # Screen flashing to black momentarily or going black when app is fullscreen # Try setting vrr to 0 From 6607eb598f13da49af0d63acee27ca5647e10b6d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 25 Apr 2026 05:12:52 -0400 Subject: [PATCH 220/232] 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 --- modules/home/editors/nixvim.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 8a6bb69..3a2a3cc 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -77,11 +77,16 @@ treesitter-context.enable = false; # Project management - project-nvim.enable = true; + project-nvim = { + enable = true; + settings = { + datapath = "${config.home.homeDirectory}/.local/share/nvim/project_nvim"; + }; + }; # Notifications and UI polish notify.enable = true; - noice.enable = true; + noice.enable = false; # Startup dashboard alpha = { From 05550da6195d75b527953663c5d24fc265445650 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 25 Apr 2026 05:18:58 -0400 Subject: [PATCH 221/232] 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 --- modules/home/editors/nixvim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 3a2a3cc..172ff0e 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -80,7 +80,7 @@ project-nvim = { enable = true; settings = { - datapath = "${config.home.homeDirectory}/.local/share/nvim/project_nvim"; + history.save_dir = "${config.home.homeDirectory}/.local/share/nvim/project_nvim"; }; }; From 72de16b9bfb96cb952c2808b89c98a2f18b66833 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 25 Apr 2026 05:25:06 -0400 Subject: [PATCH 222/232] Trying to fix project history --- modules/home/editors/nixvim.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 172ff0e..af1676d 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -460,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 + ''; } From 6fe106eccce2e96d230b8ef49c73f9179d9fbbdf Mon Sep 17 00:00:00 2001 From: dwilliams Date: Thu, 30 Apr 2026 12:52:18 -0400 Subject: [PATCH 223/232] 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 --- flake.lock | 62 +++++++++++++++---------------- hosts/zaneyos-24-vm/variables.nix | 2 +- modules/core/packages.nix | 2 - modules/home/default.nix | 2 +- 4 files changed, 33 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index c15ba0e..a258161 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1775937104, - "narHash": "sha256-JpU/iDNArShDxtRMse2ZVG4lDsjOHuDRrqt5OsTGXw8=", + "lastModified": 1777149230, + "narHash": "sha256-pu6dVB6NrIj90rrqCgJ5pPlBzS76pW4WA6rE1rD1Gp8=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "6d808e1c36b430b1e4762085912db3ccf5b2efdf", + "rev": "8c4a4a572bee519b04e9bb9207e7d993f55ecb4f", "type": "github" }, "original": { @@ -52,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" }, @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1777086106, - "narHash": "sha256-hlNpIN18pw3xo34Lsrp6vAMUPn0aB/zFBqL0QXI1Pmk=", + "lastModified": 1777518431, + "narHash": "sha256-SwgiG2T5pbyo33Vz7/vUCAhEMgwCK8Pa2nDSx5a6/WE=", "owner": "nix-community", "repo": "home-manager", - "rev": "5826802354a74af18540aef0b01bc1320f82cc17", + "rev": "2e54a938cdd4c8e414b2518edc3d82308027c670", "type": "github" }, "original": { @@ -430,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1777080231, - "narHash": "sha256-gpx+FmYpBAO4toBmQzcmdR6gVvVxT969UlB7Xz2jbFA=", + "lastModified": 1777236345, + "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=", "owner": "nix-community", "repo": "nixvim", - "rev": "f6fd130ad3b95c3c039fd7f882825c49f7e70bde", + "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1777079905, - "narHash": "sha256-TvYEXwkZnRFQRuFyyqTNSfPnU2tMdhtiBOXSk2AWLJA=", + "lastModified": 1777427472, + "narHash": "sha256-kqcfLdxb+CqTroMErCScvx6YQcZYJcf6X+z5I8kBJK8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a50c92167c8d438000270f7eca36f6eea74f388e", + "rev": "9f8dd48c8df5ab1f7f87ddf9842627e1e5682186", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776585574, - "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", + "lastModified": 1777380063, + "narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", + "rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1777062815, - "narHash": "sha256-RWwgP/R2nIcyOTPYJdApqvj/dVc4+n/4kOCNlRnfb7U=", + "lastModified": 1777478067, + "narHash": "sha256-2vZnUuv8fg2sIE6pXgGxZQQ3ZhQW1XE7Sxieg8gK2p4=", "owner": "notashelf", "repo": "nvf", - "rev": "41394699260ffc533a688d0ca5b8888bd5e64233", + "rev": "13c4ad4b4bb926c22945e2fb8862769fe51f27f1", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1776893932, - "narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=", + "lastModified": 1777501441, + "narHash": "sha256-+QWZ2/LvtEfbI4a5OiJmfv8aypBdm0u4Ui9t6LNHkRc=", "owner": "danth", "repo": "stylix", - "rev": "84971726c7ef0bb3669a5443e151cc226e65c518", + "rev": "0bd266569c03b74234b8a2ae73d05055fb02a35f", "type": "github" }, "original": { @@ -844,11 +844,11 @@ ] }, "locked": { - "lastModified": 1777058936, - "narHash": "sha256-H7XdcjRBA4UROm6KNi+mR+E22LW8vb0jRfoz1GHpPCo=", + "lastModified": 1777564084, + "narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9027d5218172c3aa2060d43e599d3304c9c13bc0", + "rev": "d93443c0f6fdb3b179bed68856f322dba4842612", "type": "github" }, "original": { diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix index 05dfff9..ab6507d 100644 --- a/hosts/zaneyos-24-vm/variables.nix +++ b/hosts/zaneyos-24-vm/variables.nix @@ -22,7 +22,7 @@ doomEmacsEnable = true; # Python development tools - pythonEnable = true; + pythonEnable = false; # Hyprland Settings # Examples: diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 513b2aa..bff7dbd 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -54,8 +54,6 @@ in { 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 diff --git a/modules/home/default.nix b/modules/home/default.nix index f6b29e7..4b1a69f 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -58,7 +58,7 @@ in { ./wlogout ./xdg.nix ./yazi - ./zen-browser.nix + #./zen-browser.nix ./zoxide.nix ./zsh ] From affa1f0ce61c347ba8335f4f94e7b6f915c24d76 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Thu, 30 Apr 2026 12:58:25 -0400 Subject: [PATCH 224/232] Updated CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28bb55d..269eda2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ # 🚀 **Current Release - ZaneyOS v2.6.1** +- 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 From a5ca67a7fb01ddba83a8b3a631aa28b5934eb660 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 1 May 2026 11:10:11 -0400 Subject: [PATCH 225/232] Added override for openssl-v1.1.1w needed by discord Discord and direnv still call opnessl-v1.1.1w Which is EOL Addeing this override until they update their versions On branch zos-next-grub Your branch is up to date with 'origin/zos-next-grub'. Changes to be committed: modified: modules/core/packages.nix modified: modules/home/editors/vscode.nix --- modules/core/packages.nix | 1 + modules/home/editors/vscode.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/core/packages.nix b/modules/core/packages.nix index ea6d858..7676c6a 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -41,6 +41,7 @@ in { }; nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; environment.systemPackages = with pkgs; [ diff --git a/modules/home/editors/vscode.nix b/modules/home/editors/vscode.nix index 62e4eb6..bbf9f07 100644 --- a/modules/home/editors/vscode.nix +++ b/modules/home/editors/vscode.nix @@ -91,4 +91,5 @@ in { }; }; nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; } From 60b97fe42cb9b7a111ab8b1f6e25a86b42971dfe Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 1 May 2026 11:22:23 -0400 Subject: [PATCH 226/232] 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 --- modules/core/packages.nix | 1 + modules/home/editors/vscode.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/core/packages.nix b/modules/core/packages.nix index bff7dbd..5c7a7a9 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -39,6 +39,7 @@ in { }; nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; environment.systemPackages = with pkgs; [ diff --git a/modules/home/editors/vscode.nix b/modules/home/editors/vscode.nix index 8b2d3dc..4f3ce02 100644 --- a/modules/home/editors/vscode.nix +++ b/modules/home/editors/vscode.nix @@ -90,4 +90,5 @@ in { }; }; nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; } From 145d98da1d39681d73ada63a2e210968342f9a5e Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 1 May 2026 11:28:53 -0400 Subject: [PATCH 227/232] Updated FLAKE --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a258161..68969f2 100644 --- a/flake.lock +++ b/flake.lock @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1777518431, - "narHash": "sha256-SwgiG2T5pbyo33Vz7/vUCAhEMgwCK8Pa2nDSx5a6/WE=", + "lastModified": 1777647296, + "narHash": "sha256-B2dllLZyocJ9fN4io22eadYPWynvAdRq/zC2NSjw52k=", "owner": "nix-community", "repo": "home-manager", - "rev": "2e54a938cdd4c8e414b2518edc3d82308027c670", + "rev": "d181e6ac2ad01e50c914220d7478fed50b1dbf68", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1777501441, - "narHash": "sha256-+QWZ2/LvtEfbI4a5OiJmfv8aypBdm0u4Ui9t6LNHkRc=", + "lastModified": 1777580129, + "narHash": "sha256-6buSTzDtHYCJP1JNAIZCmgNcOs76oN03j+21CxdijVo=", "owner": "danth", "repo": "stylix", - "rev": "0bd266569c03b74234b8a2ae73d05055fb02a35f", + "rev": "20ff51f523e2dd67e5f31a321719d30708c1b771", "type": "github" }, "original": { From b2165ec35eff758a8bcea50a61eb2b7b639e8834 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Tue, 5 May 2026 15:43:09 -0400 Subject: [PATCH 228/232] 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 --- flake.lock | 96 +++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 68969f2..2d2d44c 100644 --- a/flake.lock +++ b/flake.lock @@ -103,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": { @@ -158,11 +158,11 @@ "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": { @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1777932387, + "narHash": "sha256-nUYVPiqrzr36ThiQOAr5MKeGHDBSDM3OFWkz0uDjOvc=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "71a3a77326609675e9f8b51084cf23d5d1945899", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1777647296, - "narHash": "sha256-B2dllLZyocJ9fN4io22eadYPWynvAdRq/zC2NSjw52k=", + "lastModified": 1778009629, + "narHash": "sha256-nUoQtf4Zq7DRYJrfv904hjrxjAlWVP6a1pNNFKx3FCg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d181e6ac2ad01e50c914220d7478fed50b1dbf68", + "rev": "00ed86e58bb6979a7921859fd1615d19382eac5c", "type": "github" }, "original": { @@ -377,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": { @@ -430,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -462,11 +462,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1777236345, - "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=", + "lastModified": 1777991353, + "narHash": "sha256-DFwjggMV+nzCZpwK6Obxj9F+P59rbLVowGqHETfctBk=", "owner": "nix-community", "repo": "nixvim", - "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4", + "rev": "7986a276960b4dfaed9bb2c3c438b5ba71ae08f1", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1777427472, - "narHash": "sha256-kqcfLdxb+CqTroMErCScvx6YQcZYJcf6X+z5I8kBJK8=", + "lastModified": 1777859147, + "narHash": "sha256-0vCgxdwrxBkHmqNgJtUMGCFwSV5a6AgYdKAgBCtFFPM=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9f8dd48c8df5ab1f7f87ddf9842627e1e5682186", + "rev": "6b48834dd6c3913d211476ab2f964f3fb100675e", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1777380063, - "narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=", + "lastModified": 1777773024, + "narHash": "sha256-pLU+KB84A0Jei/vTD6pOS4Ovkmq3QDfPQHg1MlKsRqM=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d", + "rev": "d3e26ccd9eecde9139be00caf5dc2d4260fb31ee", "type": "github" }, "original": { @@ -554,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": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1777478067, - "narHash": "sha256-2vZnUuv8fg2sIE6pXgGxZQQ3ZhQW1XE7Sxieg8gK2p4=", + "lastModified": 1777963724, + "narHash": "sha256-DM3sF8ikMrqPGapSOpYYtwqfYMU/xDaP/UzmmdC0lgI=", "owner": "notashelf", "repo": "nvf", - "rev": "13c4ad4b4bb926c22945e2fb8862769fe51f27f1", + "rev": "5dc8f3a34cf46d98f6a0073368adc2746b854cf6", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1777580129, - "narHash": "sha256-6buSTzDtHYCJP1JNAIZCmgNcOs76oN03j+21CxdijVo=", + "lastModified": 1777835090, + "narHash": "sha256-VLH8zPweblCOvpnQXp4fVs7f6Q79YhXF5XFKlOrvIFk=", "owner": "danth", "repo": "stylix", - "rev": "20ff51f523e2dd67e5f31a321719d30708c1b771", + "rev": "7989a1054b01153212dede6005abfd1576b8328c", "type": "github" }, "original": { @@ -769,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": { @@ -785,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": { @@ -801,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": { From 927e38e5dc49e1f8d7d0b303f8475f56d0088337 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 8 May 2026 10:59:48 -0400 Subject: [PATCH 229/232] Updated flake --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 2d2d44c..9533a50 100644 --- a/flake.lock +++ b/flake.lock @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1778009629, - "narHash": "sha256-nUoQtf4Zq7DRYJrfv904hjrxjAlWVP6a1pNNFKx3FCg=", + "lastModified": 1778248595, + "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=", "owner": "nix-community", "repo": "home-manager", - "rev": "00ed86e58bb6979a7921859fd1615d19382eac5c", + "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1777859147, - "narHash": "sha256-0vCgxdwrxBkHmqNgJtUMGCFwSV5a6AgYdKAgBCtFFPM=", + "lastModified": 1778104114, + "narHash": "sha256-+tbqLv7IW5Aem8kGF6cp4n3MtNBcwqmuGlMt6S1kQjs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "6b48834dd6c3913d211476ab2f964f3fb100675e", + "rev": "eb2b53ddaa7564f5c93031cbe65cd5b6ef3c12a9", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1777963724, - "narHash": "sha256-DM3sF8ikMrqPGapSOpYYtwqfYMU/xDaP/UzmmdC0lgI=", + "lastModified": 1778049651, + "narHash": "sha256-EC5pBiLcP/EVmYWldJRNfkChCqF9rkeTnTs8t9Cs+ZY=", "owner": "notashelf", "repo": "nvf", - "rev": "5dc8f3a34cf46d98f6a0073368adc2746b854cf6", + "rev": "88dbbad1f44efe3d2c18903e2c7542452f7bdfd6", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1777835090, - "narHash": "sha256-VLH8zPweblCOvpnQXp4fVs7f6Q79YhXF5XFKlOrvIFk=", + "lastModified": 1778104276, + "narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=", "owner": "danth", "repo": "stylix", - "rev": "7989a1054b01153212dede6005abfd1576b8328c", + "rev": "18ed8d270231e067fe2739998479ed5d7c659c2c", "type": "github" }, "original": { From 93c05ad88e2548c8b691dd06c82f77e4f91973d2 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 9 May 2026 14:48:57 -0400 Subject: [PATCH 230/232] 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 --- hosts/default/host-packages.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/hosts/default/host-packages.nix b/hosts/default/host-packages.nix index 0febf63..8f9f927 100644 --- a/hosts/default/host-packages.nix +++ b/hosts/default/host-packages.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{configs, pkgs, ...}: { + environment.systemPackages = with pkgs; [ # Add local pacakaged here ]; @@ -9,4 +10,19 @@ ]; }; }; + + + services.auto-cpufreq.enable = false; + services.auto-cpufreq.settings = { + battery = { + governor = "powersave"; + turbo = "never"; + }; + charger = { + governor = "performance"; + turbo = "auto"; + }; + }; + + } From 9c0c13d3ca7cd93bcef6a4a66ed84cec532013b1 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 9 May 2026 14:51:24 -0400 Subject: [PATCH 231/232] Added cpufrew power mgmt but disabled by default On branch zos-next-grub Your branch is up to date with 'origin/zos-next-grub'. Changes to be committed: modified: hosts/default/host-packages.nix --- hosts/default/host-packages.nix | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/hosts/default/host-packages.nix b/hosts/default/host-packages.nix index 33b6047..d998650 100644 --- a/hosts/default/host-packages.nix +++ b/hosts/default/host-packages.nix @@ -1,4 +1,30 @@ -{pkgs, ...}: { +{config, pkgs, ...}: { + environment.systemPackages = with pkgs; [ ]; + + # Add host specific flatpaks here + services = { + flatpak = { + packages = [ + ]; + }; + }; + + # For power mangement on laptops + + services.auto-cpufreq.enable = false; + services.auto-cpufreq.settings = { + battery = { + governor = "powersave"; + turbo = "never"; + }; + charger = { + governor = "performance"; + turbo = "auto"; + }; + }; + + + } From fb12d82468c482119d09d36340025b6d2ef67f1c Mon Sep 17 00:00:00 2001 From: dwilliams Date: Mon, 11 May 2026 14:36:06 -0400 Subject: [PATCH 232/232] Updated flake --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 9533a50..e53589f 100644 --- a/flake.lock +++ b/flake.lock @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1777932387, - "narHash": "sha256-nUYVPiqrzr36ThiQOAr5MKeGHDBSDM3OFWkz0uDjOvc=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71a3a77326609675e9f8b51084cf23d5d1945899", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1778248595, - "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=", + "lastModified": 1778503501, + "narHash": "sha256-08L/X4/do7nET4rzidJ76eV/1r+mB7DchVpdPypsghc=", "owner": "nix-community", "repo": "home-manager", - "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d", + "rev": "85ba629c79449badf4338117c27f0ee92b4b9f1a", "type": "github" }, "original": { @@ -362,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": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1777991353, - "narHash": "sha256-DFwjggMV+nzCZpwK6Obxj9F+P59rbLVowGqHETfctBk=", + "lastModified": 1778510615, + "narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=", "owner": "nix-community", "repo": "nixvim", - "rev": "7986a276960b4dfaed9bb2c3c438b5ba71ae08f1", + "rev": "fa8cd368d27cf9541f086485884928315abdcc8c", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1778104114, - "narHash": "sha256-+tbqLv7IW5Aem8kGF6cp4n3MtNBcwqmuGlMt6S1kQjs=", + "lastModified": 1778464608, + "narHash": "sha256-tZRvyaKVP0DJ9DSFrr6K/l3X74Orfirk3Jjo7+br4Qs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "eb2b53ddaa7564f5c93031cbe65cd5b6ef3c12a9", + "rev": "761869a561548874fe7e293b157fd7841576b367", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1777773024, - "narHash": "sha256-pLU+KB84A0Jei/vTD6pOS4Ovkmq3QDfPQHg1MlKsRqM=", + "lastModified": 1778377995, + "narHash": "sha256-uUzHDHqQF1rdVNiTa05L0mML3/d7fpbAShjCRWxbrBQ=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "d3e26ccd9eecde9139be00caf5dc2d4260fb31ee", + "rev": "d8327a723eed6dd9aebe8e0b162126f390e827df", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1778049651, - "narHash": "sha256-EC5pBiLcP/EVmYWldJRNfkChCqF9rkeTnTs8t9Cs+ZY=", + "lastModified": 1778408907, + "narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=", "owner": "notashelf", "repo": "nvf", - "rev": "88dbbad1f44efe3d2c18903e2c7542452f7bdfd6", + "rev": "e86a92e4b29b499e5f1285b737b7612115103da9", "type": "github" }, "original": { @@ -844,11 +844,11 @@ ] }, "locked": { - "lastModified": 1777564084, - "narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=", + "lastModified": 1778377655, + "narHash": "sha256-wHsd+tesB3FtwUZbGjU/sWMZhw0m0yYBSXufMDVyQmc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d93443c0f6fdb3b179bed68856f322dba4842612", + "rev": "101d6731d7b163ef4f6fab8c6eea7da4ddb52ec3", "type": "github" }, "original": {