amd 238 current 2024-11-29 07:56:56 24.11.20241129.3d7df75 6.6.60 *

developing-today · Nov 29, 2024 · f6b4d8b · f6b4d8b
1 parent 857828b
commit f6b4d8b
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 9 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -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";