diff --git a/flake.lock b/flake.lock index 851ec73..0420f18 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1710121140, - "narHash": "sha256-dBsIjSPUVlufY90U1cRcStC6vs/D58dKQKzM6XNIhsM=", + "lastModified": 1710189206, + "narHash": "sha256-BKD+JrinQN3V0Xf8Ft/P770shnUpxNRVjGKB0YU1OoI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "66330281ff19e84c986c5ce639b670929e5dadd6", + "rev": "a065b481f32f4297596a9cd9c538794fd4669b1a", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1710158996, - "narHash": "sha256-4B+5vZhABvGEdjj9ud375hdgzD8OUmFTjMhLSKY1ObA=", + "lastModified": 1710184940, + "narHash": "sha256-FzYm4td3FJfzOAuEkCXt3KdUgZuA072OAQXqIq+IAMo=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "167c734afc6b89a520157ef4ba85a82caee221fa", + "rev": "45b75bf534592c0c1c881a1c447f7fdb37a87eaf", "type": "github" }, "original": { @@ -285,17 +285,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710129248, - "narHash": "sha256-bWF8ZEL5VHS+mLXrd4kpe4QnthMvxXofjMzFd9yG5gs=", + "lastModified": 1708757172, + "narHash": "sha256-+7oFDmyYpDz9GIB2n8FH/LtLi2TaJ9zr8LdlTAIREvI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8c4e5e571696d4c476881cf90257c3dd0e66b0dd", + "rev": "d5decf6e964b50425195ea8fd831931bb10b064f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "d5decf6e964b50425195ea8fd831931bb10b064f", "type": "github" } }, @@ -326,11 +326,11 @@ ] }, "locked": { - "lastModified": 1710166490, - "narHash": "sha256-AnKwni6ulrluQ3do7sFZGwXUYrEzJvpQGX0amiFvw4w=", + "lastModified": 1710185740, + "narHash": "sha256-MJtMIwXXIhIcIObEVb2VyKJNNmJM0qAMdS49K1PW2mE=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "2cba0604bab71a40af176c141ff82a9adb1a92f4", + "rev": "1ce086a5ec78554848ab094cc135eb6c26839642", "type": "github" }, "original": { @@ -367,7 +367,24 @@ "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", "nixpkgs-wayland": "nixpkgs-wayland", - "pinix": "pinix" + "pinix": "pinix", + "stable": "stable" + } + }, + "stable": { + "locked": { + "lastModified": 1710021367, + "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" } }, "systems": { diff --git a/flake.nix b/flake.nix index fff3357..f23b671 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,10 @@ .oizysFlake {}; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + # nixpkgs.url = "github:nixos/nixpkgs/032162631dbfefa15898fc5ddd8daef484fd6d53"; + nixpkgs.url = "github:nixos/nixpkgs/d5decf6e964b50425195ea8fd831931bb10b064f"; + + stable.url = "github:nixos/nixpkgs/nixos-23.11"; hyprland.url = "github:hyprwm/Hyprland/main"; hyprland.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/othalan/system.nix b/hosts/othalan/system.nix index 2a7874c..76a0aa5 100644 --- a/hosts/othalan/system.nix +++ b/hosts/othalan/system.nix @@ -44,7 +44,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.consoleMode = "max"; boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages_latest; + # boot.kernelPackages = pkgs.linuxPackages_latest; # This option defines the first version of NixOS you have installed on this particular machine, # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. diff --git a/modules/languages/python.nix b/modules/languages/python.nix index 416dc98..28bc6d3 100644 --- a/modules/languages/python.nix +++ b/modules/languages/python.nix @@ -6,6 +6,7 @@ }: let inherit (lib) mkIfIn; cfg = config.oizys.languages; + pixi = pkgs.callPackage ../../pkgs/pixi.nix {}; in { config = mkIfIn "python" cfg { environment.systemPackages = let diff --git a/overlays/default.nix b/overlays/default.nix index 852504e..19a66c4 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -10,5 +10,13 @@ (f: f != "default.nix") (builtins.attrNames (builtins.readDir ./.))); in { - nixpkgs.overlays = defaultOverlays; + nixpkgs.overlays = defaultOverlays ++ [ + ( + final: prev: { + stable = import inputs.stable { system = final.system; + config.allowUnfree = true; + }; + } + ) + ]; }