From 2932d8a443f6e313c2798d30f9ec840daa2e13f9 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sun, 14 Dec 2025 10:38:46 -0500 Subject: [PATCH] rebase to unstable update lock (12/15/2025) --- flake.lock | 139 ++++------------------ flake.nix | 6 +- home/all.nix | 67 +++++------ home/qt/qt5ct/qt5ct.conf | 32 ----- home/qt/qt5ct/style-colors.conf | 4 - home/qt/qt6ct/qt6ct.conf | 32 ----- home/qt/qt6ct/style-colors.conf | 4 - home/tiling/niri/niri.nix | 2 +- packages/linux-asahi-bleeding/package.nix | 63 ++++++++++ packages/overlay.nix | 2 + system/all.nix | 2 +- system/hosts/peach/default.nix | 27 +++-- 12 files changed, 141 insertions(+), 239 deletions(-) delete mode 100644 home/qt/qt5ct/qt5ct.conf delete mode 100644 home/qt/qt5ct/style-colors.conf delete mode 100644 home/qt/qt6ct/qt6ct.conf delete mode 100644 home/qt/qt6ct/style-colors.conf create mode 100644 packages/linux-asahi-bleeding/package.nix diff --git a/flake.lock b/flake.lock index 23776c9..7c046f4 100644 --- a/flake.lock +++ b/flake.lock @@ -113,24 +113,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -138,48 +120,19 @@ ] }, "locked": { - "lastModified": 1765605144, - "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=", + "lastModified": 1765682243, + "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "90b62096f099b73043a747348c11dbfcfbdea949", + "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", "repo": "home-manager", "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" - } - }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -192,11 +145,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765629179, - "narHash": "sha256-yYQR3ZYXWEh8mAQOhj6ZOZ4VxZrpzhRz14bOXAMPtcQ=", + "lastModified": 1765786620, + "narHash": "sha256-MPgXA3vfeUclJAt1r1LfH6TXmcqDEJm3HVDjr4Y1fIs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "46e723aa46565b67910187b4b7ad48b615d7f576", + "rev": "97440574d71b235b601013edf4749397b1ce99a6", "type": "github" }, "original": { @@ -225,11 +178,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1765625997, - "narHash": "sha256-d0/ugnBSrCJwwySMc5skOMbAfEdjWapc+EMFbcsnd5Q=", + "lastModified": 1765687800, + "narHash": "sha256-Erk+ypR8N+rCvjMdUB1N/v4jtm4QRH9k7r/9zh2HyC8=", "owner": "YaLTeR", "repo": "niri", - "rev": "d1fc1ab731f7cc59923a16acce9a387782bfeb10", + "rev": "7c0898570ca5bd3f10fbf4cf2f8a00edc48d787b", "type": "github" }, "original": { @@ -240,27 +193,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1765762245, + "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "type": "github" }, "original": { @@ -276,20 +229,18 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1765647805, - "narHash": "sha256-CdaiOfpBiS4kw/DR0Ut+02fpFnjM8hNZMZ53a1pavak=", + "lastModified": 1765796308, + "narHash": "sha256-szKgoF0JbDUvWkqjB2AyyFagmsF5ZFEjajZRUiUV9mU=", "owner": "nix-community", "repo": "nixvim", - "rev": "f0b0cc7cae2cf5d76608c9164ab8824a2387e146", + "rev": "12a76dd12beccd8d18249b05d10d6acda4e722e0", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-25.11", "repo": "nixvim", "type": "github" } @@ -301,11 +252,11 @@ ] }, "locked": { - "lastModified": 1765675278, - "narHash": "sha256-GSa/jaWld+WKxt39DDBPoX1j+kCdNmFF9stTWbeVhp8=", + "lastModified": 1765811783, + "narHash": "sha256-cON2s/eSCpqd+5ijOOt03+70UPEk7YoLwUw5ofWiV9g=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "7d795256de6dbe7b4044161af2b6002421bdb188", + "rev": "50a014f1a61b64127755591a62cf8fab33d203e3", "type": "github" }, "original": { @@ -322,11 +273,11 @@ ] }, "locked": { - "lastModified": 1765679538, - "narHash": "sha256-y6PplijrOq2lI7QjHjcBbi/NT2R1PrpNnjkMgB/83r4=", + "lastModified": 1765815077, + "narHash": "sha256-o25WeGyDzOUDM0Ek5gbd6xSz31WMbHhZJN24uPGsmXE=", "owner": "nix-community", "repo": "NUR", - "rev": "a23427eb9342c578becbe0179e2654e622c41cdb", + "rev": "c5178bd6a61784f5d1e65dfe3c1e79b22a7cbcf2", "type": "github" }, "original": { @@ -335,29 +286,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -410,21 +338,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index b3811f9..9bf8615 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "My NixOS Configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; catppuccin = { url = "github:catppuccin/nix"; @@ -14,7 +14,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -40,7 +40,7 @@ }; nixvim = { - url = "github:nix-community/nixvim/nixos-25.11"; + url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/all.nix b/home/all.nix index 9aa1f06..f58f656 100755 --- a/home/all.nix +++ b/home/all.nix @@ -179,16 +179,6 @@ ]; home.file = { - ".config/qt5ct" = { - source = ./qt/qt5ct; - recursive = true; - force = true; - }; - ".config/qt6ct" = { - source = ./qt/qt6ct; - recursive = true; - force = true; - }; ".icons/default/index.theme" = { text = '' [Icon Theme] @@ -230,36 +220,33 @@ }; }; - # qt = { - # enable = true; - # # the following will be possible in NixOS 26.05 - # # https://github.com/nix-community/home-manager/commit/f9d45d664ed06a11861d0ba29e34f390c07bf62e - # # until this flake is updated, it will use the configs as implemented above - # qt5ctSettings = { - # Appearance = { - # style = "Breeze"; - # icon_theme = config.gtk.iconTheme.name; - # color_scheme = "catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}"; - # standard_dialogs = "default"; - # }; - # Fonts = { - # fixed = "\"${config.userOptions.fontMono.name},${config.userOptions.fontMono.name}\""; - # general = "\"${config.userOptions.fontSans.name},${config.userOptions.fontSans.size}\""; - # }; - # }; - # qt6ctSettings = { - # Appearance = { - # style = "Breeze"; - # icon_theme = config.gtk.iconTheme.name; - # color_scheme = "catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}"; - # standard_dialogs = "default"; - # }; - # Fonts = { - # fixed = "\"${config.userOptions.fontMono.name},${config.userOptions.fontMono.name}\""; - # general = "\"${config.userOptions.fontSans.name},${config.userOptions.fontSans.size}\""; - # }; - # }; - # }; + qt = { + enable = true; + qt5ctSettings = { + Appearance = { + style = "Breeze"; + icon_theme = config.gtk.iconTheme.name; + color_scheme = "catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}"; + standard_dialogs = "default"; + }; + Fonts = { + fixed = "\"${config.userOptions.fontMono.name},${config.userOptions.fontMono.name}\""; + general = "\"${config.userOptions.fontSans.name},${toString config.userOptions.fontSans.size}\""; + }; + }; + qt6ctSettings = { + Appearance = { + style = "Breeze"; + icon_theme = config.gtk.iconTheme.name; + color_scheme = "catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}"; + standard_dialogs = "default"; + }; + Fonts = { + fixed = "\"${config.userOptions.fontMono.name},${config.userOptions.fontMono.name}\""; + general = "\"${config.userOptions.fontSans.name},${toString config.userOptions.fontSans.size}\""; + }; + }; + }; services = { spotifyd = { diff --git a/home/qt/qt5ct/qt5ct.conf b/home/qt/qt5ct/qt5ct.conf deleted file mode 100644 index 89cf609..0000000 --- a/home/qt/qt5ct/qt5ct.conf +++ /dev/null @@ -1,32 +0,0 @@ -[Appearance] -color_scheme_path=/home/sckova/.config/qt5ct/style-colors.conf -custom_palette=true -icon_theme=Colloid-Dark -standard_dialogs=default -style=Breeze - -[Fonts] -fixed="Noto Sans,12,-1,5,50,0,0,0,0,0" -general="Noto Sans,12,-1,5,50,0,0,0,0,0" - -[Interface] -activate_item_on_single_click=1 -buttonbox_layout=0 -cursor_flash_time=1000 -dialog_buttons_have_icons=1 -double_click_interval=400 -gui_effects=@Invalid() -keyboard_scheme=2 -menus_have_icons=true -show_shortcuts_in_context_menus=true -stylesheets=@Invalid() -toolbutton_style=4 -underline_shortcut=1 -wheel_scroll_lines=3 - -[SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W\0\0\0\0\0\0\0\0\x6\xc0\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W) - -[Troubleshooting] -force_raster_widgets=1 -ignored_applications=@Invalid() diff --git a/home/qt/qt5ct/style-colors.conf b/home/qt/qt5ct/style-colors.conf deleted file mode 100644 index 4afdd7c..0000000 --- a/home/qt/qt5ct/style-colors.conf +++ /dev/null @@ -1,4 +0,0 @@ -[ColorScheme] -active_colors=#ffcdd6f4, #ff313244, #ff3d3d5e, #ff2f2f48, #ff0c0c12, #ff151520, #ffcdd6f4, #ffcdd6f4, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff09090d, #fffab387, #ff11111b, #fffab387, #ffcba6f7, #ff181825, #ffffffff, #ff1e1e2e, #ffcdd6f4, #806c7086 -disabled_colors=#ff6c7086, #ff313244, #ff45475a, #ff313244, #ff11111b, #ff181825, #ff6c7086, #ffcdd6f4, #ff6c7086, #ff1e1e2e, #ff181825, #ff11111b, #ff181825, #ff6c7086, #ffa9bcdb, #ffc7cceb, #ff181825, #ffffffff, #ff1e1e2e, #ffcdd6f4, #806c7086 -inactive_colors=#ffcdd6f4, #ff313244, #ff3d3d5e, #ff2f2f48, #ff0c0c12, #ff151520, #ffcdd6f4, #ffcdd6f4, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff09090d, #fffab387, #ff11111b, #fffab387, #ffcba6f7, #ff181825, #ffffffff, #ff1e1e2e, #ffcdd6f4, #806c7086 diff --git a/home/qt/qt6ct/qt6ct.conf b/home/qt/qt6ct/qt6ct.conf deleted file mode 100644 index 673d92f..0000000 --- a/home/qt/qt6ct/qt6ct.conf +++ /dev/null @@ -1,32 +0,0 @@ -[Appearance] -color_scheme_path=/home/sckova/.config/qt6ct/style-colors.conf -custom_palette=true -icon_theme=Colloid-Dark -standard_dialogs=default -style=Breeze - -[Fonts] -fixed="Noto Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" -general="Noto Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" - -[Interface] -activate_item_on_single_click=1 -buttonbox_layout=0 -cursor_flash_time=1000 -dialog_buttons_have_icons=1 -double_click_interval=400 -gui_effects=@Invalid() -keyboard_scheme=2 -menus_have_icons=true -show_shortcuts_in_context_menus=true -stylesheets=@Invalid() -toolbutton_style=4 -underline_shortcut=1 -wheel_scroll_lines=3 - -[SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W\0\0\0\0\0\0\0\0\x6\xc0\0\0\0\0\0\0\0\0\0\0\x3V\0\0\x4W) - -[Troubleshooting] -force_raster_widgets=1 -ignored_applications=@Invalid() diff --git a/home/qt/qt6ct/style-colors.conf b/home/qt/qt6ct/style-colors.conf deleted file mode 100644 index 0af60d5..0000000 --- a/home/qt/qt6ct/style-colors.conf +++ /dev/null @@ -1,4 +0,0 @@ -[ColorScheme] -active_colors=#ffcdd6f4, #ff313244, #ff3d3d5e, #ff2f2f48, #ff0c0c12, #ff151520, #ffcdd6f4, #ffffffff, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff09090d, #fffab387, #ff11111b, #fffab387, #ffcba6f7, #ff181825, #ff000000, #ff1e1e2e, #ffcdd6f4, #ffa6adc8, #fffab387 -disabled_colors=#ffbebebe, #ffefefef, #ffffffff, #ffcacaca, #ffbebebe, #ffb8b8b8, #ffbebebe, #ffffffff, #ffbebebe, #ffefefef, #ffefefef, #ffb1b1b1, #ff919191, #ffffffff, #ff0000ff, #ffff00ff, #fff7f7f7, #ff000000, #ffffffdc, #ff000000, #80000000, #ff919191 -inactive_colors=#ffcdd6f4, #ff313244, #ff3d3d5e, #ff2f2f48, #ff0c0c12, #ff151520, #ffcdd6f4, #ffffffff, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff09090d, #fffab387, #ff11111b, #fffab387, #ffcba6f7, #ff181825, #ff000000, #ff1e1e2e, #ffcdd6f4, #ffa6adc8, #fffab387 diff --git a/home/tiling/niri/niri.nix b/home/tiling/niri/niri.nix index 8b6cc76..1518790 100644 --- a/home/tiling/niri/niri.nix +++ b/home/tiling/niri/niri.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - programs.niri.package = pkgs.niri-stable.overrideAttrs (old: { + programs.niri.package = pkgs.niri-unstable.overrideAttrs (old: { doCheck = false; }); # https://github.com/sodiboo/niri-flake/blob/main/docs.md diff --git a/packages/linux-asahi-bleeding/package.nix b/packages/linux-asahi-bleeding/package.nix new file mode 100644 index 0000000..f9610fb --- /dev/null +++ b/packages/linux-asahi-bleeding/package.nix @@ -0,0 +1,63 @@ +{ + lib, + callPackage, + linuxPackagesFor, + _kernelPatches ? [ ], +}: + +let + linux-asahi-pkg = + { + stdenv, + lib, + fetchFromGitHub, + buildLinux, + ... + }: + buildLinux rec { + inherit stdenv lib; + + pname = "linux-asahi"; + version = "6.17.11"; + modDirVersion = version; + extraMeta.branch = "6.17"; + + src = fetchFromGitHub { + owner = "AsahiLinux"; + repo = "linux"; + tag = "asahi-6.17.11-1"; + hash = "sha256-bTptFNR7ehMdW3M05c0S6GZ4H19GCYvplso8zOkEnmQ="; + }; + + kernelPatches = [ + { + name = "Asahi config"; + patch = null; + structuredExtraConfig = with lib.kernel; { + # Needed for GPU + ARM64_16K_PAGES = yes; + + ARM64_MEMORY_MODEL_CONTROL = yes; + ARM64_ACTLR_STATE = yes; + + # Might lead to the machine rebooting if not loaded soon enough + APPLE_WATCHDOG = yes; + + # Can not be built as a module, defaults to no + APPLE_M1_CPU_PMU = yes; + + # Defaults to 'y', but we want to allow the user to set options in modprobe.d + HID_APPLE = module; + + APPLE_PMGR_MISC = yes; + APPLE_PMGR_PWRSTATE = yes; + }; + features.rust = true; + } + ] + ++ _kernelPatches; + }; + + linux-asahi = callPackage linux-asahi-pkg { }; +in +lib.recurseIntoAttrs (linuxPackagesFor linux-asahi) diff --git a/packages/overlay.nix b/packages/overlay.nix index 71bf926..84be97b 100644 --- a/packages/overlay.nix +++ b/packages/overlay.nix @@ -24,6 +24,8 @@ final: prev: { inherit helium-widevine; }; + linux-asahi = prev.callPackage (builtins.path { path = ./linux-asahi-bleeding/package.nix; }) { }; + spotifyd = prev.callPackage (builtins.path { path = ./spotifyd/package.nix; }) { }; widevine-firefox = prev.callPackage (builtins.path { path = ./widevine-firefox/package.nix; }) { }; diff --git a/system/all.nix b/system/all.nix index b14f6cd..8eba616 100755 --- a/system/all.nix +++ b/system/all.nix @@ -138,7 +138,7 @@ programs.niri = { enable = true; - package = pkgs.niri-stable.overrideAttrs (old: { + package = pkgs.niri-unstable.overrideAttrs (old: { doCheck = false; }); }; diff --git a/system/hosts/peach/default.nix b/system/hosts/peach/default.nix index 97b45af..6ae0712 100644 --- a/system/hosts/peach/default.nix +++ b/system/hosts/peach/default.nix @@ -15,6 +15,24 @@ boot.kernelParams = [ "apple_dcp.show_notch=1" ]; + # fixes a regression that crashes firefox by upgrading + # from 25.3.1 to 25.3.2 (very unstable) + # https://github.com/nix-community/nixos-apple-silicon/issues/380 + nixpkgs.overlays = [ + (final: prev: { + mesa = prev.mesa.overrideAttrs (oldAttrs: { + version = "25.3.2"; + src = prev.fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mesa"; + repo = "mesa"; + rev = "11000ba6afe0f32cbeed45d4db3c65ff51487dec"; + hash = "sha256-YZg17uATScPwjUEEMEuY3NFNdpMdOOYbD6Zoh5psl6I="; + }; + }); + }) + ]; + catppuccin.accent = "peach"; home-manager.users.sckova = { @@ -35,15 +53,6 @@ }; }; - # hardware.graphics.package = - # # Workaround for Mesa 25.3.0 regression - # # https://github.com/nix-community/nixos-apple-silicon/issues/380 - # assert pkgs.mesa.version == "25.3.0"; - # (import (fetchTarball { - # url = "https://github.com/NixOS/nixpkgs/archive/c5ae371f1a6a7fd27823bc500d9390b38c05fa55.tar.gz"; - # sha256 = "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE="; - # }) { localSystem = pkgs.stdenv.hostPlatform; }).mesa; - swapDevices = [ { device = "/swapfile";