From 927eb9193334e1b8375fccd6f110785fc4ea9d36 Mon Sep 17 00:00:00 2001 From: xenia Date: Sun, 16 Feb 2025 16:57:58 +0100 Subject: [PATCH] move to nixpkgs-unstable :sob: --- flake.lock | 68 ++++++++++++++++++++-------------- flake.nix | 6 +-- home/kak.nix | 4 +- nixos/graphical.nix | 8 +--- nixos/machines/foxhut/boot.nix | 2 +- 5 files changed, 47 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index f18cec6c..bddaa78c 100644 --- a/flake.lock +++ b/flake.lock @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1731832479, - "narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=", + "lastModified": 1738228963, + "narHash": "sha256-Ee5hVHM7AWxaq7XJN6xiZztTZX8csdXernjqaTW5r9I=", "owner": "nix-community", "repo": "home-manager", - "rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111", + "rev": "d963ed335b890a70ed53eecf14cdb21528eda9b8", "type": "github" }, "original": { @@ -132,9 +132,7 @@ "kak": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1733339173, @@ -157,11 +155,11 @@ ] }, "locked": { - "lastModified": 1716993688, - "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "lastModified": 1738033138, + "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", "type": "github" }, "original": { @@ -173,15 +171,15 @@ "nixos-apple-silicon": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731473366, - "narHash": "sha256-sE2WfD3YyNrCROfRZKqMDR77g3KV4FXUaJ7NWe+A7ro=", + "lastModified": 1737610453, + "narHash": "sha256-OLgl/kgjOmDFrkU04PlqVklXj1m9y8xF7xbD+blAdg8=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "3eee753e4b074790342fadb1c4e7183d037ddac4", + "rev": "1f7bdbb82f6b9ec1d8d206e2c64d36f13bae91a1", "type": "github" }, "original": { @@ -192,27 +190,25 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1731858824, + "narHash": "sha256-0KhJ6SOyWjx408tsgcoVQFx9nEn55DwrhFbCE49Oyac=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "7937932921ea34c51c1b586e2505574f6f0be5a7", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733097829, - "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", + "lastModified": 1738136902, + "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", + "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", "type": "github" }, "original": { @@ -224,16 +220,32 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731858824, - "narHash": "sha256-0KhJ6SOyWjx408tsgcoVQFx9nEn55DwrhFbCE49Oyac=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7937932921ea34c51c1b586e2505574f6f0be5a7", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-24.11", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -245,7 +257,7 @@ "kak": "kak", "nix-darwin": "nix-darwin", "nixos-apple-silicon": "nixos-apple-silicon", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "unambig-path": "unambig-path", "unispect": "unispect" diff --git a/flake.nix b/flake.nix index b38cc514..3907e21c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,7 @@ description = "Home Manager configuration of xenia"; inputs = { - # Specify the source of Home Manager and Nixpkgs. - # TODO: We run whole system unstable until 24.11 drops, then the gpu drivers should work - nixpkgs.url = "github:nixos/nixpkgs/release-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # required for mesa to work properly home-manager = { url = "github:nix-community/home-manager/master"; @@ -18,7 +16,7 @@ }; kak = { url = "git+https://githug.xyz/xenia/kakoune.git"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; unispect = { url = "git+https://git@githug.xyz/xenia/unispect"; diff --git a/home/kak.nix b/home/kak.nix index 60b372da..a47446d8 100644 --- a/home/kak.nix +++ b/home/kak.nix @@ -37,8 +37,8 @@ with pkgs; let src = fetchFromGitHub { owner = "kakoune-lsp"; repo = "kakoune-lsp"; - rev = "v18.0.2"; - sha256 = "sha256-nfPc0ccEk+szaTJby56iMmydcDKDq/t1o8tw24c7MfY="; + rev = "v18.1.2"; + sha256 = "sha256-wIKAChmD6gVfrRguywiAnpT3kbCbRk2k2u4ckd1CNOw="; }; meta.homepage = "https://github.com/kakoune-lsp/kakoune-lsp/"; }; diff --git a/nixos/graphical.nix b/nixos/graphical.nix index 30bd5f49..e84e8102 100644 --- a/nixos/graphical.nix +++ b/nixos/graphical.nix @@ -8,14 +8,11 @@ let start-plasma-shortcut = pkgs.writeScriptBin "desktop" '' ${pkgs.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed ${pkgs.plasma-workspace}/bin/startplasma-wayland ''; - # kicad is broken in 2411 - # TODO: update to 2411 - pkgs_2405 = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/e8c38b73aeb218e27163376a2d617e61a2ad9b59.tar.gz") {}; kicad-patch = pkgs.stdenv.mkDerivation { name = "kicad-patch"; - version = pkgs_2405.kicad-small.version; - src = pkgs_2405.kicad-small; + version = pkgs.kicad-small.version; + src = pkgs.kicad-small; buildInputs = [ pkgs.makeWrapper ]; buildPhase = '' @@ -115,7 +112,6 @@ in kicad-patch freecad-fem nicotine-plus - ]) ++ (with pkgs_2405; [ firefox ]); } diff --git a/nixos/machines/foxhut/boot.nix b/nixos/machines/foxhut/boot.nix index 71936606..3ed7e5e4 100644 --- a/nixos/machines/foxhut/boot.nix +++ b/nixos/machines/foxhut/boot.nix @@ -11,7 +11,7 @@ hardware.asahi.setupAsahiSound = true; hardware.asahi.useExperimentalGPUDriver = true; - hardware.asahi.experimentalGPUInstallMode = "replace"; + # hardware.asahi.experimentalGPUInstallMode = "replace"; fileSystems.foxshare = { fsType = "exfat";