diff --git a/flake.lock b/flake.lock index ee380b96..c87c6df1 100644 --- a/flake.lock +++ b/flake.lock @@ -1609,6 +1609,21 @@ "type": "github" } }, + "nixpkgs-inner": { + "locked": { + "lastModified": 1732870904, + "narHash": "sha256-adEoSUgEvhu3EALownix60oZn+RFyK2IyMmaegWNaFg=", + "owner": "developing-today-forks", + "repo": "nixpkgs", + "rev": "3d7df7505e72968164f9f1adc637a00d99fe4a0f", + "type": "github" + }, + "original": { + "owner": "developing-today-forks", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1710695816, @@ -1818,17 +1833,23 @@ } }, "nixpkgs_6": { + "inputs": { + "nixpkgs": [ + "nixpkgs-inner" + ] + }, "locked": { - "lastModified": 1732870904, - "narHash": "sha256-adEoSUgEvhu3EALownix60oZn+RFyK2IyMmaegWNaFg=", - "owner": "developing-today-forks", - "repo": "nixpkgs", - "rev": "3d7df7505e72968164f9f1adc637a00d99fe4a0f", + "lastModified": 1732717389, + "narHash": "sha256-Tm6fvNAG8uF/5BEel8juVGZpuapEJIAfb8QbBV2Q3r4=", + "owner": "numtide", + "repo": "nixpkgs-unfree", + "rev": "14dca4a5268429e333a0537be948c856ac50e6a3", "type": "github" }, "original": { - "owner": "developing-today-forks", - "repo": "nixpkgs", + "owner": "numtide", + "ref": "nixos-unstable", + "repo": "nixpkgs-unfree", "type": "github" } }, @@ -2105,6 +2126,7 @@ "nix-topology": "nix-topology", "nixos-hardware": "nixos-hardware_2", "nixpkgs": "nixpkgs_6", + "nixpkgs-inner": "nixpkgs-inner", "nixpkgs-stable": "nixpkgs-stable_4", "nixvim": "nixvim", "omnix": "omnix", diff --git a/flake.nix b/flake.nix index 859e5006..71740292 100755 --- a/flake.nix +++ b/flake.nix @@ -40,9 +40,15 @@ rec { }; arunoruto.url = "github:arunoruto/flake"; unattended-installer.url = "github:developing-today-forks/nixos-unattended-installer"; + + # nixpkgs-inner.url = "github:developing-today-forks/nixpkgs"; nixpkgs.url = "github:developing-today-forks/nixpkgs"; # nixpkgs.url = "github:dezren39/nixpkgs"; # nixpkgs.url = "github:NixOS/nixpkgs"; + # nixpkgs = { + # url = "github:numtide/nixpkgs-unfree?ref=nixos-unstable"; + # inputs.nixpkgs.follows = "nixpkgs-inner"; + # }; # nixpkgs-stable.url = "github:developing-today-forks/nixpkgs"; # nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; @@ -207,7 +213,6 @@ rec { # }; }; nixConfig = { - # allow-unfree = true; # unfortunately can't import, but this should be equal to flake.nix experimental-features = [ "auto-allocate-uids" diff --git a/nixos/environment/default.nix b/nixos/environment/default.nix index ab3392fb..333fe28c 100644 --- a/nixos/environment/default.nix +++ b/nixos/environment/default.nix @@ -6,7 +6,16 @@ }: { environment = { - sessionVariables.NIXOS_OZONE_WL = "1"; # This variable fixes electron apps in wayland + sessionVariables = { + NIXOS_OZONE_WL = "1"; # This variable fixes electron apps in wayland + NIXPKGS_ALLOW_UNFREE = "1"; + XDG_CACHE_HOME = "$HOME/.cache"; + # XDG_CONFIG_DIRS = "/etc/xdg"; + XDG_CONFIG_HOME = "$HOME/.config"; + # XDG_DATA_DIRS = "/usr/local/share/:/usr/share/"; + XDG_DATA_HOME = "$HOME/.local/share"; + XDG_STATE_HOME = "$HOME/.local/state"; + }; variables = { EDITOR = "nvim"; NIX_REMOTE = "daemon";