From ab4cdf63682bf934b0e01339514e5392c73c3a48 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Wed, 24 Dec 2025 21:23:48 -0500 Subject: [PATCH 01/92] 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 cdec0772a5d2a10050e621b73f436474ee1a743c Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 26 Dec 2025 18:36:38 -0500 Subject: [PATCH 02/92] 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 f2dfddff6a3a19c47817db7ebb8a822903f25a43 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 26 Dec 2025 20:34:18 -0500 Subject: [PATCH 03/92] 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 04/92] 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 5e815311f8ef985e9c04367d477d74318f8cd261 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 29 Dec 2025 09:31:56 -0500 Subject: [PATCH 05/92] 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 06/92] 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 3f13aed7756645f7bc0abec4258aec2694e93519 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 1 Jan 2026 01:07:49 -0500 Subject: [PATCH 07/92] 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 08/92] 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 3f9126b8e8d642a1b9766fef896376572742d25f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 4 Jan 2026 17:00:00 -0500 Subject: [PATCH 09/92] 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 10/92] 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 11/92] 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 6f408c9732537ce90576d94c6eecb8daae63c902 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 5 Jan 2026 07:28:48 -0500 Subject: [PATCH 12/92] 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 d26b8450fae2dcafca1a4c9d854cb4e127eea02b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 5 Jan 2026 16:55:39 -0500 Subject: [PATCH 13/92] 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 14/92] 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 15/92] 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 16/92] 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 17/92] 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 80f8bfb41a3c52b4ff5c3686d02af7d04ade1418 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Wed, 7 Jan 2026 20:48:58 -0500 Subject: [PATCH 18/92] 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 ae758cccef3f15bbdb3bf0cc437ac66fa9d0abe0 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Thu, 15 Jan 2026 17:01:52 -0500 Subject: [PATCH 19/92] 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 7322a8ed85ea3bbcbd1a4535b168242557d241c1 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 16 Jan 2026 18:27:36 -0500 Subject: [PATCH 20/92] 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 21/92] 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 22/92] 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 23/92] 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 24/92] 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 4afc385c16dd777dfd285c963767cea2ad05c20e Mon Sep 17 00:00:00 2001 From: Kexuan Yang Date: Fri, 23 Jan 2026 22:37:22 +0800 Subject: [PATCH 25/92] 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 694cc69cc44d7677cf613d2c9235ff0fc86bf9c8 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 23 Jan 2026 09:54:11 -0500 Subject: [PATCH 26/92] 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 27/92] 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 f612693b8fa3167962c2d2aea63574ca1e081bea Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 26 Jan 2026 18:59:17 -0500 Subject: [PATCH 28/92] 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 29/92] 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 30/92] 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 31/92] 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 32/92] 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 33/92] 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 e3cb8291c5cb76e4c7e354556e24c60d8f8757bd Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 27 Jan 2026 23:05:01 -0500 Subject: [PATCH 34/92] 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 35/92] 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 36/92] 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 37/92] 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 38/92] 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 39/92] 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 ce02cc2ead99506a85814f2fe383e6f0ca6041db Mon Sep 17 00:00:00 2001 From: Jesse Stoltz Date: Fri, 13 Feb 2026 18:30:30 +0000 Subject: [PATCH 40/92] 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 3a7a54c2080ec12405100fc0d0db6c08627ceb68 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 22:10:12 -0500 Subject: [PATCH 41/92] 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 6dc70452ef9aae7f3903a810eb7a5a47e9a6be2f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 22:39:42 -0500 Subject: [PATCH 42/92] 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 43/92] 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 e5dac51840755b1dedc540df9c517d8727895e6c Mon Sep 17 00:00:00 2001 From: dwilliams Date: Mon, 16 Feb 2026 23:13:34 -0500 Subject: [PATCH 44/92] 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 45/92] 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 e3c98cd6337ff93c1df19d52bfebe756184c777d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Feb 2026 23:16:19 -0500 Subject: [PATCH 46/92] 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 47/92] 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 48/92] 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 a5c1fb20648c91ad68b72538623ca75c56b1c5b0 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Thu, 19 Feb 2026 19:44:38 -0500 Subject: [PATCH 49/92] 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 4f8d983ab3d03f470571dc09ac6ba3bf74e42f22 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 24 Feb 2026 18:26:18 -0500 Subject: [PATCH 50/92] 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 0d2b750e37b4d78c1d7c3ad84dcaba6296f33dec Mon Sep 17 00:00:00 2001 From: dwilliams Date: Thu, 26 Feb 2026 15:15:21 -0500 Subject: [PATCH 51/92] 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 52/92] 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 2ababcca8bd84d917baebf385a8c65d2d8fe804f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 26 Feb 2026 15:31:18 -0500 Subject: [PATCH 53/92] 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 39b8117fcf10206f9e39c5e6c9cb547fb74d92e4 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 2 Mar 2026 04:09:26 -0500 Subject: [PATCH 54/92] 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 55/92] 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 56/92] 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 57/92] 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 0a3e015b22fdf62f71b270cbde6e3fc6bd5f3e27 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 13 Mar 2026 04:29:34 -0400 Subject: [PATCH 58/92] 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 59/92] 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 d3880758b27483fc2b2545c8b6ddc0fcc583179d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 16 Mar 2026 04:17:28 -0400 Subject: [PATCH 60/92] 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 a7753d4945dfda19abac9fcdb9cc3d2a3842237a Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 20 Mar 2026 21:30:20 -0400 Subject: [PATCH 61/92] 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 62/92] 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 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 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 9ba72c53face44c98098955deff105ed0d069b58 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 20 Mar 2026 22:44:06 -0400 Subject: [PATCH 63/92] 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 8e16811c60bdc53ece3520da22c51db5a4c25ddc Mon Sep 17 00:00:00 2001 From: dwilliams Date: Tue, 24 Mar 2026 00:52:07 -0400 Subject: [PATCH 64/92] 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 65/92] 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 66/92] 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 27ba6b39350271a85cfe6f0f5f6f0273682315d8 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Tue, 24 Mar 2026 14:14:39 -0400 Subject: [PATCH 67/92] 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 68/92] 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 10f3587c6af15995df132eaeaa165f8e4828472f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 3 Apr 2026 14:06:14 -0400 Subject: [PATCH 69/92] 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 70/92] 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 71/92] 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 72/92] 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 73/92] 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 74/92] 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 75/92] 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 76/92] 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 605b66fbb49cbe02ee047c32dbfdbc41e3c0eb02 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 5 Apr 2026 17:33:55 -0400 Subject: [PATCH 77/92] 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 78/92] 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 b797cac7007e11c14d4deb822d103d71f756c248 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 9 Apr 2026 18:41:13 -0400 Subject: [PATCH 79/92] 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 f5106616b5d789a35456b4984b68c31d4e7620dd Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 17 Apr 2026 08:43:34 -0400 Subject: [PATCH 80/92] 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 6027ada4d1849ad4a637c632c2047401558cecc9 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Sat, 25 Apr 2026 03:21:01 -0400 Subject: [PATCH 81/92] 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 6607eb598f13da49af0d63acee27ca5647e10b6d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 25 Apr 2026 05:12:52 -0400 Subject: [PATCH 82/92] 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 83/92] 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 84/92] 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 85/92] 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 86/92] 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 60b97fe42cb9b7a111ab8b1f6e25a86b42971dfe Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 1 May 2026 11:22:23 -0400 Subject: [PATCH 87/92] 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 88/92] 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 89/92] 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 90/92] 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 91/92] 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 fb12d82468c482119d09d36340025b6d2ef67f1c Mon Sep 17 00:00:00 2001 From: dwilliams Date: Mon, 11 May 2026 14:36:06 -0400 Subject: [PATCH 92/92] 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": {