From 923cebd9c9f742566b2b11a208185ab459b3c297 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Tue, 16 Dec 2025 15:35:47 -0500 Subject: [PATCH 1/2] modified inputs to move over to 25.11 release --- flake.lock | 65 +++++++++++++++++++++---------- flake.nix | 6 +-- modules/common/environment.nix | 65 +------------------------------ modules/common/fonts.nix | 2 +- modules/common/linker.nix | 63 ++++++++++++++++++++++++++++++ modules/machine/cloud/default.nix | 1 + 6 files changed, 113 insertions(+), 89 deletions(-) create mode 100644 modules/common/linker.nix diff --git a/flake.lock b/flake.lock index afe5db6..2b0b67b 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765245541, - "narHash": "sha256-Q4KU8bvFL3tJb1sTAPFG6qvi0KP8HvAfLG7mGqdSQV8=", + "lastModified": 1765900816, + "narHash": "sha256-Pa7QpF+84hTuPanVaJ/B3NgdaytUMj3PN06sEaNibaM=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "f251969383969412b94a98c9378deaa114a76338", + "rev": "36b14e5e7014e471341f0807dc9a9e2d65a157f4", "type": "github" }, "original": { @@ -29,16 +29,16 @@ ] }, "locked": { - "lastModified": 1762912391, - "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=", + "lastModified": 1765066094, + "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126", + "rev": "688427b1aab9afb478ca07989dc754fa543e03d5", "type": "github" }, "original": { "owner": "lnl7", - "ref": "nix-darwin-25.05", + "ref": "nix-darwin-25.11", "repo": "nix-darwin", "type": "github" } @@ -97,16 +97,17 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", + "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1765752037, - "narHash": "sha256-hjqxmMTTiGBBELqnwiomBv8FaowC5MPHMVr+tKQZybU=", + "lastModified": 1765908726, + "narHash": "sha256-tUvTIxhD2aGbyBQgDXknoKWQpuNrgt9TrGQaV9q1WOQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "1d7fe9e70d5800de8de6244ebb1d07efb74ec36e", + "rev": "67eb4805779a80bfe2d9ac5a67f19b89f4e67b16", "type": "github" }, "original": { @@ -118,15 +119,16 @@ "home-manager": { "inputs": { "nixpkgs": [ + "ghostty", "nixpkgs" ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1755776884, + "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", "type": "github" }, "original": { @@ -136,6 +138,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765859973, + "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-25.11", + "repo": "home-manager", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1739444422, @@ -183,16 +206,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765363881, - "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=", + "lastModified": 1765762245, + "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0", + "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -218,7 +241,7 @@ "aagl": "aagl", "darwin": "darwin", "ghostty": "ghostty", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay_2" @@ -247,11 +270,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1765680428, - "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=", + "lastModified": 1765852971, + "narHash": "sha256-rQdOMqfQNhcfqvh1dFIVWh09mrIWwerUJqqBdhIsf8g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f", + "rev": "5f98ccecc9f1bc1c19c0a350a659af1a04b3b319", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 88d7dbe..80af847 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,14 @@ { description = "Wyatt's nix configuration suite"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; darwin = { - url = "github:lnl7/nix-darwin/nix-darwin-25.05"; + url = "github:lnl7/nix-darwin/nix-darwin-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; ghostty.url = "github:ghostty-org/ghostty"; diff --git a/modules/common/environment.nix b/modules/common/environment.nix index 6944978..e72b0c3 100644 --- a/modules/common/environment.nix +++ b/modules/common/environment.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: { +{ lib, pkgs, ... }: { environment.systemPackages = with pkgs; [ git vim @@ -18,68 +18,5 @@ # nothing here, yet ;) ]); - programs.nix-ld = lib.mkIf pkgs.stdenv.isLinux { - enable = true; - libraries = with pkgs; - [ - acl - attr - bzip2 - dbus - expat - fontconfig - freetype - fuse3 - icu - libnotify - libsodium - libssh - libunwind - libusb1 - libuuid - nspr - nss - stdenv.cc.cc - util-linux - zlib - zstd - ] - ++ lib.optionals (config.hardware.graphics.enable) [ - pipewire - cups - libxkbcommon - pango - mesa - libdrm - libglvnd - libpulseaudio - atk - cairo - alsa-lib - at-spi2-atk - at-spi2-core - gdk-pixbuf - glib - gtk3 - libGL - libappindicator-gtk3 - vulkan-loader - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.libxkbfile - xorg.libxshmfence - ]; - }; - environment.variables.EDITOR = "nvim"; } diff --git a/modules/common/fonts.nix b/modules/common/fonts.nix index 855f4c6..3e2f7b5 100644 --- a/modules/common/fonts.nix +++ b/modules/common/fonts.nix @@ -6,7 +6,7 @@ fonts.packages = with pkgs; [ noto-fonts - noto-fonts-emoji + noto-fonts-color-emoji liberation_ttf noto-fonts-cjk-sans monaspace diff --git a/modules/common/linker.nix b/modules/common/linker.nix new file mode 100644 index 0000000..4798f54 --- /dev/null +++ b/modules/common/linker.nix @@ -0,0 +1,63 @@ +{ pkgs, ... }: { + programs.nix-ld = { + enable = true; + libraries = with pkgs; + [ + acl + attr + bzip2 + dbus + expat + fontconfig + freetype + fuse3 + icu + libnotify + libsodium + libssh + libunwind + libusb1 + libuuid + nspr + nss + stdenv.cc.cc + util-linux + zlib + zstd + ] ++ lib.optionals (config.hardware.graphics.enable) [ + pipewire + cups + libxkbcommon + pango + mesa + libdrm + libglvnd + libpulseaudio + atk + cairo + alsa-lib + at-spi2-atk + at-spi2-core + gdk-pixbuf + glib + gtk3 + libGL + libappindicator-gtk3 + vulkan-loader + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxcb + xorg.libxkbfile + xorg.libxshmfence + ]; + }; +} diff --git a/modules/machine/cloud/default.nix b/modules/machine/cloud/default.nix index 187a110..90be192 100644 --- a/modules/machine/cloud/default.nix +++ b/modules/machine/cloud/default.nix @@ -2,5 +2,6 @@ imports = [ ./configuration.nix ./hardware-configuration.nix + ../../common/linker.nix ]; } From 45ca39596220517b87e4139e631b9e0c9f052717 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Tue, 16 Dec 2025 17:59:40 -0500 Subject: [PATCH 2/2] modified modules for nixos to build correctly --- modules/apps/gaming.nix | 2 +- modules/common/linker.nix | 1 - modules/graphics/default.nix | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index b2909ef..d65b69e 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -211,7 +211,7 @@ in { )) ++ (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++ - (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkBasalt pkgs.vkbasalt-cli]) ++ + (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkbasalt-cli]) ++ (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++ (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]); diff --git a/modules/common/linker.nix b/modules/common/linker.nix index 4798f54..c5cf36b 100644 --- a/modules/common/linker.nix +++ b/modules/common/linker.nix @@ -24,7 +24,6 @@ util-linux zlib zstd - ] ++ lib.optionals (config.hardware.graphics.enable) [ pipewire cups libxkbcommon diff --git a/modules/graphics/default.nix b/modules/graphics/default.nix index 94eeeee..47fc13f 100644 --- a/modules/graphics/default.nix +++ b/modules/graphics/default.nix @@ -40,7 +40,6 @@ in { config = mkIf cfg.enable (mkMerge [ { environment.systemPackages = with pkgs; [ - glxinfo vulkan-tools mesa-demos ];