working unstable commit

This commit is contained in:
Daylin Morgan 2024-03-12 09:12:26 -05:00
parent a67cd9d0ed
commit 38d3219ad4
Signed by: daylin
GPG key ID: 950D13E9719334AD
5 changed files with 46 additions and 17 deletions

View file

@ -93,11 +93,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1710121140, "lastModified": 1710189206,
"narHash": "sha256-dBsIjSPUVlufY90U1cRcStC6vs/D58dKQKzM6XNIhsM=", "narHash": "sha256-BKD+JrinQN3V0Xf8Ft/P770shnUpxNRVjGKB0YU1OoI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "66330281ff19e84c986c5ce639b670929e5dadd6", "rev": "a065b481f32f4297596a9cd9c538794fd4669b1a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,11 +206,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1710158996, "lastModified": 1710184940,
"narHash": "sha256-4B+5vZhABvGEdjj9ud375hdgzD8OUmFTjMhLSKY1ObA=", "narHash": "sha256-FzYm4td3FJfzOAuEkCXt3KdUgZuA072OAQXqIq+IAMo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "167c734afc6b89a520157ef4ba85a82caee221fa", "rev": "45b75bf534592c0c1c881a1c447f7fdb37a87eaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -285,17 +285,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1710129248, "lastModified": 1708757172,
"narHash": "sha256-bWF8ZEL5VHS+mLXrd4kpe4QnthMvxXofjMzFd9yG5gs=", "narHash": "sha256-+7oFDmyYpDz9GIB2n8FH/LtLi2TaJ9zr8LdlTAIREvI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8c4e5e571696d4c476881cf90257c3dd0e66b0dd", "rev": "d5decf6e964b50425195ea8fd831931bb10b064f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d5decf6e964b50425195ea8fd831931bb10b064f",
"type": "github" "type": "github"
} }
}, },
@ -326,11 +326,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710166490, "lastModified": 1710185740,
"narHash": "sha256-AnKwni6ulrluQ3do7sFZGwXUYrEzJvpQGX0amiFvw4w=", "narHash": "sha256-MJtMIwXXIhIcIObEVb2VyKJNNmJM0qAMdS49K1PW2mE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "2cba0604bab71a40af176c141ff82a9adb1a92f4", "rev": "1ce086a5ec78554848ab094cc135eb6c26839642",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,7 +367,24 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-wayland": "nixpkgs-wayland", "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": { "systems": {

View file

@ -8,7 +8,10 @@
.oizysFlake {}; .oizysFlake {};
inputs = { 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.url = "github:hyprwm/Hyprland/main";
hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland.inputs.nixpkgs.follows = "nixpkgs";

View file

@ -44,7 +44,7 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.consoleMode = "max"; boot.loader.systemd-boot.consoleMode = "max";
boot.loader.efi.canTouchEfiVariables = true; 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, # 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. # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.

View file

@ -6,6 +6,7 @@
}: let }: let
inherit (lib) mkIfIn; inherit (lib) mkIfIn;
cfg = config.oizys.languages; cfg = config.oizys.languages;
pixi = pkgs.callPackage ../../pkgs/pixi.nix {};
in { in {
config = mkIfIn "python" cfg { config = mkIfIn "python" cfg {
environment.systemPackages = let environment.systemPackages = let

View file

@ -10,5 +10,13 @@
(f: f != "default.nix") (f: f != "default.nix")
(builtins.attrNames (builtins.readDir ./.))); (builtins.attrNames (builtins.readDir ./.)));
in { in {
nixpkgs.overlays = defaultOverlays; nixpkgs.overlays = defaultOverlays ++ [
(
final: prev: {
stable = import inputs.stable { system = final.system;
config.allowUnfree = true;
};
}
)
];
} }