From d1113e546c45fccd65d2374d0397e51abd948fe6 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Mon, 16 Feb 2026 13:51:12 +1000 Subject: [PATCH 1/3] fix stable base --- groups/unstable-base/default.nix | 9 +++++++++ nixpkgs.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 groups/unstable-base/default.nix diff --git a/groups/unstable-base/default.nix b/groups/unstable-base/default.nix new file mode 100644 index 0000000..9ee1305 --- /dev/null +++ b/groups/unstable-base/default.nix @@ -0,0 +1,9 @@ +{ + lib, + config, + ... +}: { + nixpkgs.channels.default = { + default = lib.mkForce config.nixpkgs.channels.default.upkgs; + }; +} diff --git a/nixpkgs.nix b/nixpkgs.nix index 43eb7f7..50fcf68 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -4,7 +4,7 @@ ... } @ args: { nixpkgs.channels.default = rec { - default = upkgs; + default = pkgs; # nixpkgs pkgs = { -- 2.51.2 From b7eb55c821354105e93fad50bcd1505732680fa6 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Wed, 18 Feb 2026 17:31:22 +1000 Subject: [PATCH 2/3] nixcon 2026 <3 --- flake.lock | 138 +++++++++++++++++------------------ flake.nix | 1 - homes/aurora/default.nix | 9 +-- hosts/nixarawrui/default.nix | 6 +- nixpkgs.nix | 11 ++- overlays.nix | 1 - snow.nix | 45 ++++++------ 7 files changed, 105 insertions(+), 106 deletions(-) diff --git a/flake.lock b/flake.lock index a209193..49d49cd 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1770834979, - "narHash": "sha256-gh7GOW1y06dsfCnzBlx+qkkDUqnr1AhXBRjihUTB3w4=", + "lastModified": 1771353108, + "narHash": "sha256-5Xtei4UKrqRC6IYLgI1KEBaPN9Xfef5JeOexdqDWVeg=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "36658048dacf3e409f17dfd1465eee1e4e217432", + "rev": "98e777cdcc39e6bd0312a9d756507ef9cbd284cb", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1770747435, - "narHash": "sha256-MR4xm9zQZ5LuoHWWdrlWJyEJablzx36nY19dXpY4VE4=", + "lastModified": 1771263855, + "narHash": "sha256-akyds1g8cb742d2OrnQ4YciscpynsQ0+0YD2a8aZdvo=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "661da6f123bf3984e462fe9f932a38e643d6e081", + "rev": "5ece16c7b4a7d1261da68153cafc318a60b78ce8", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1770760828, - "narHash": "sha256-bcAZJG390mv9fFJwzyFl3iRyrTpSTWsra14qBJujR4A=", + "lastModified": 1771246613, + "narHash": "sha256-GftqKiyIgMcSgVkbNqXQq7oNnoL1+EB9V71XG4lPBRs=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "87a5bb45dfee4cf31a57472591cb5013a7e9afcf", + "rev": "cb320a13e3c92f32ada27acb1fba8a828a22ae60", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1771296113, - "narHash": "sha256-a7yA8+RCLnNh/ZMljgzX286z85XxtVTaeQe8mGWgbcA=", + "lastModified": 1771399468, + "narHash": "sha256-Nppe/RD8/zJZ9e1vhX/Ma1fKZ+rMbp8ZFPMflTLGbk8=", "ref": "refs/heads/main", - "rev": "59d1028e19d9ac5f43122d08119e90d77e56a7da", - "revCount": 169, + "rev": "870bbb1f3738736ea248c171685bffdb242e294a", + "revCount": 172, "type": "git", "url": "https://tearforge.net/cry/cerulean" }, @@ -384,11 +384,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "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": { @@ -483,11 +483,11 @@ ] }, "locked": { - "lastModified": 1770910055, - "narHash": "sha256-6HJVLBtbf2ub4a3P9YG+a3CTzzUcy4HpLz4IQdiyVxY=", + "lastModified": 1771269455, + "narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", "owner": "nix-community", "repo": "home-manager", - "rev": "0825a0922a5d677f5f984bb79524569bbd1f9954", + "rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", "type": "github" }, "original": { @@ -505,11 +505,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": { @@ -983,11 +983,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1770310890, - "narHash": "sha256-lyWAs4XKg3kLYaf4gm5qc5WJrDkYy3/qeV5G733fJww=", + "lastModified": 1771365290, + "narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "68c9f9c6ca91841f04f726a298c385411b7bfcd5", + "rev": "789c90b164b55b4379e7a94af8b9c01489024c18", "type": "github" }, "original": { @@ -1004,11 +1004,11 @@ "spectrum": "spectrum_2" }, "locked": { - "lastModified": 1770310890, - "narHash": "sha256-lyWAs4XKg3kLYaf4gm5qc5WJrDkYy3/qeV5G733fJww=", + "lastModified": 1771365290, + "narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "68c9f9c6ca91841f04f726a298c385411b7bfcd5", + "rev": "789c90b164b55b4379e7a94af8b9c01489024c18", "type": "github" }, "original": { @@ -1128,11 +1128,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1768904356, - "narHash": "sha256-TIG8J+Or8nOydy8TztvtIshnprlf1q6XDIJnopLtMlA=", + "lastModified": 1771150922, + "narHash": "sha256-+oQJun4CFDlOQRocbZpqQDj7agoy56/4ZjT1oUR7NOs=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "d95b25a4dd6da2a1dfeaaf66163d0a281a8270e9", + "rev": "96045e886ba0dd45b27590e7c0c6e77bbb54033d", "type": "github" }, "original": { @@ -1172,11 +1172,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1771130777, + "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "efec7aaad8d43f8e5194df46a007456093c40f88", "type": "github" }, "original": { @@ -1232,11 +1232,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1770365342, - "narHash": "sha256-jV5tAs67HSBWz/ePEp1eyoUK3Lqfc1fEAvt2wC6reFc=", + "lastModified": 1771375681, + "narHash": "sha256-qDDw0ruBZ1kt63j4uVP5Xrd1OxGKIYrSFnig0z6ozSw=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "51db830336715209a4a213aa985f4d405ff0be69", + "rev": "d030dbb48ab020092681a39c878c1d48a553ffc1", "type": "github" }, "original": { @@ -1278,11 +1278,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "72716169fe93074c333e8d0173151350670b824c", "type": "github" }, "original": { @@ -1293,11 +1293,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1770984692, - "narHash": "sha256-n6HUgG2+cvLcQkZEgXu14qgl/SrKC4EZerQXod0HGDg=", + "lastModified": 1771384451, + "narHash": "sha256-rFs7+EFjAglrHFhRz3N/M+fyn28q+dR4gVC9/9yoWS0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7b82c0fddf16a5e3fee29bbd8e0c8c67158176d", + "rev": "4f8a766def570768a6cefe8ea42f839eff9dc1eb", "type": "github" }, "original": { @@ -1309,11 +1309,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770841267, - "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -1325,11 +1325,11 @@ }, "nixpkgs_10": { "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": { @@ -1341,11 +1341,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770818322, - "narHash": "sha256-tttCN+yrhM7svQW6DqtS3JV9POrRJAaS/e0xuUHBTEM=", + "lastModified": 1771309086, + "narHash": "sha256-25aY7PIHMmoVW5w/x8Bs4vsfSV94A5htwiLINJ4KMuY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d9ca3a4b73f19ea147c9d977d3dde8f612ac648f", + "rev": "5e17f00eb60368a4b4b110a89f1c250f9a12c053", "type": "github" }, "original": { @@ -1421,11 +1421,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1768305791, - "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -1437,11 +1437,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1770770419, - "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", + "lastModified": 1770617025, + "narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", + "rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", "type": "github" }, "original": { @@ -1453,11 +1453,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1771043024, - "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=", + "lastModified": 1771208521, + "narHash": "sha256-X01Q3DgSpjeBpapoGA4rzKOn25qdKxbPnxHeMLNoHTU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44", + "rev": "fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8", "type": "github" }, "original": { @@ -1650,11 +1650,11 @@ ] }, "locked": { - "lastModified": 1770846656, - "narHash": "sha256-wdYpo8++TqKp3GdRgLFykjuIVW1m9GlUnxID2FG74cE=", + "lastModified": 1771268051, + "narHash": "sha256-nGqPcngnezoT+/xAvw3UDjwdKP2MC4fO315A/Otb9eE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "40e65cfc4608402674e1efaac3fccce20d2a72d3", + "rev": "b930de84c561f62a0c39a6a57c2ab553a97e8495", "type": "github" }, "original": { @@ -1843,11 +1843,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1770910552, - "narHash": "sha256-iJ9c0ZewfRRYUflaEOj43n5TWaB6Ezygn2UA/ZHGQJA=", + "lastModified": 1771381854, + "narHash": "sha256-6uEDuQYEGuyuFnvOdSx+fW75tRbNiLswAl6+4qyTdJ4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "15656b755cf2e75bd3e67ded6c7709bc09262c27", + "rev": "0fa995bec0e391b45b032fbd9d6e03609a30c115", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e6bfe6d..c356c4e 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,6 @@ }; cerulean = { - #url = "git+https://tearforge.net/cry/cerulean?ref=refs/tags/v0.2.2-alpha"; url = "git+https://tearforge.net/cry/cerulean"; inputs = { systems.follows = "systems"; diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index 075e10e..abae254 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -45,6 +45,8 @@ XDG_DATA_HOME = "$HOME/.local/share"; XDG_STATE_HOME = "$HOME/.local/state"; XDG_BIN_HOME = "$HOME/.local/bin"; # not official spec + + NIXOS_OZONE_WL = "1"; }; home.sessionPath = [ @@ -303,13 +305,6 @@ }; }; - # Environment / Session Variables - home = { - sessionVariables = { - NIXOS_OZONE_WL = "1"; - }; - }; - # The state version is required and should stay the version you originally installed home.stateVersion = "24.11"; } diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index fde75be..58c1c92 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -294,7 +294,7 @@ via # wine - needed for lutris :3 - wineWowPackages.stable + wineWow64Packages.stable # utils, apps, important default stuff ig :3 neovim @@ -317,8 +317,8 @@ (steam.override { extraPkgs = upkgs: [ nss - xorg.libX11 - xorg.libXScrnSaver + libx11 + libxscrnsaver ]; }).run diff --git a/nixpkgs.nix b/nixpkgs.nix index 50fcf68..a992db5 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -3,14 +3,16 @@ system, ... } @ args: { - nixpkgs.channels.default = rec { + nixpkgs.channels = rec { default = pkgs; # nixpkgs pkgs = { inherit system; source = inputs.nixpkgs; - overlays = []; + overlays = [ + (import ./overlays.nix args) + ]; config.allowUnfree = true; }; @@ -22,7 +24,6 @@ cachyos.overlays.pinned millennium.overlays.default - # XXX: WARNING: TODO: cerulean will (import ./overlays.nix args) ]; @@ -33,7 +34,9 @@ spkgs = { inherit system; source = inputs.nixpkgs-staging; - overlays = []; + overlays = [ + (import ./overlays.nix args) + ]; config.allowUnfree = true; }; }; diff --git a/overlays.nix b/overlays.nix index 99638ba..1a50320 100644 --- a/overlays.nix +++ b/overlays.nix @@ -1,4 +1,3 @@ -# NOTE: `system` is provided by Cerulean { inputs, system, diff --git a/snow.nix b/snow.nix index e0fe4c1..1132ca0 100644 --- a/snow.nix +++ b/snow.nix @@ -3,9 +3,7 @@ cerulean.mkNexus ./. (self: { nexus = { args = {inherit inputs;}; - modules = with inputs; [ - home-manager.nixosModules.home-manager - ]; + modules = with inputs; []; base = inputs.nixpkgs; @@ -18,12 +16,11 @@ cerulean.mkNexus ./. (self: { (self.nexus) groups ; - in - { + in { nixarawrui = { system = "x86_64-linux"; - base = inputs.nixpkgs-unstable; + # base = inputs.nixpkgs-unstable; modules = with inputs; [ sddm-silent.nixosModules.default @@ -46,7 +43,7 @@ cerulean.mkNexus ./. (self: { autostart = true; config = { - imports = [ ./vms/home-assistant/default.nix ]; + imports = [./vms/home-assistant/default.nix]; networking.hostName = "home-assistant"; @@ -59,26 +56,32 @@ cerulean.mkNexus ./. (self: { mem = 4096; # 4GB vcpu = 2; - interfaces = [{ - type = "tap"; - id = "vm-hass"; - mac = "0a:00:a0:70:01:01"; - }]; + interfaces = [ + { + type = "tap"; + id = "vm-hass"; + mac = "0a:00:a0:70:01:01"; + } + ]; - volumes = [{ - image = "/var/lib/microvms/home-assistant/data.img"; - mountPoint = "/var/lib/hass"; - size = 16384; # 16GB - }]; + volumes = [ + { + image = "/var/lib/microvms/home-assistant/data.img"; + mountPoint = "/var/lib/hass"; + size = 16384; # 16GB + } + ]; }; networking = { interfaces.eth0 = { useDHCP = false; - ipv4.addresses = [{ - address = "10.16.1.127"; - prefixLength = 24; - }]; + ipv4.addresses = [ + { + address = "10.16.1.127"; + prefixLength = 24; + } + ]; }; }; }; -- 2.51.2 From e52854fe58feec53688f48879139154855c8d405 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Wed, 18 Feb 2026 20:26:09 +1000 Subject: [PATCH 3/3] enjoy having your lights on again... --- flake.lock | 8 ++++---- nixpkgs.nix | 16 ++++++---------- snow.nix | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 49d49cd..ee749fa 100644 --- a/flake.lock +++ b/flake.lock @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1771399468, - "narHash": "sha256-Nppe/RD8/zJZ9e1vhX/Ma1fKZ+rMbp8ZFPMflTLGbk8=", + "lastModified": 1771409623, + "narHash": "sha256-1IhHueuQTVCVrui700IP9DfLXwb3kU2rnEWPSdxQY0k=", "ref": "refs/heads/main", - "rev": "870bbb1f3738736ea248c171685bffdb242e294a", - "revCount": 172, + "rev": "d5211287bd3cb96078f2053488d67d557848a8f2", + "revCount": 176, "type": "git", "url": "https://tearforge.net/cry/cerulean" }, diff --git a/nixpkgs.nix b/nixpkgs.nix index a992db5..332b14e 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1,14 +1,12 @@ -{ - inputs, - system, - ... -} @ args: { - nixpkgs.channels = rec { - default = pkgs; +{inputs, ...} @ args: { + nixpkgs.channels = { + default = { + overlays = [(import ./overlays.nix args)]; + config.allowUnfree = true; + }; # nixpkgs pkgs = { - inherit system; source = inputs.nixpkgs; overlays = [ (import ./overlays.nix args) @@ -18,7 +16,6 @@ # nixpkgs-unstable upkgs = { - inherit system; source = inputs.nixpkgs-unstable; overlays = with inputs; [ cachyos.overlays.pinned @@ -32,7 +29,6 @@ # nixpkgs-staging spkgs = { - inherit system; source = inputs.nixpkgs-staging; overlays = [ (import ./overlays.nix args) diff --git a/snow.nix b/snow.nix index 1132ca0..60b53b8 100644 --- a/snow.nix +++ b/snow.nix @@ -20,7 +20,7 @@ cerulean.mkNexus ./. (self: { nixarawrui = { system = "x86_64-linux"; - # base = inputs.nixpkgs-unstable; + base = inputs.nixpkgs-unstable; modules = with inputs; [ sddm-silent.nixosModules.default -- 2.51.2