From 4b9a204b4d623f1fe35a7d2afce24912c3f0b6e6 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Fri, 11 Nov 2022 20:38:33 +0100
Subject: [PATCH] Fix allowUnfree shizzle

---
 flake.nix                                  | 50 +++++++++++-----------
 home-manager/modules/alacritty/default.nix |  1 -
 machines/loki/configuration.nix            |  4 +-
 modules/greetd/default.nix                 |  1 -
 users/erwin/home.nix                       |  2 +-
 5 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/flake.nix b/flake.nix
index e031230..beb01d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -152,32 +152,34 @@
         (
           system:
           let
-            pkgs = import nixpkgs {
-              inherit system;
-              overlays = [
-                self.overlays.default
-                ha-now-playing.overlays.${system}
-                pamedia.overlays.${system}
-              ];
-              # config = {
-              #   allowUnsupportedSystem = true;
-              #   allowUnfree = true;
-              # };
-            };
+            # pkgs = import nixpkgs {
+            #   inherit system;
+            #   overlays = [
+            #     self.overlays.default
+            #     ha-now-playing.overlays.${system}
+            #     pamedia.overlays.${system}
+            #   ];
+            #   config = {
+            #     allowUnsupportedSystem = true;
+            #     allowUnfree = true;
+            #   };
+            # };
+            pkgs = nixpkgs.legacyPackages.${system};
           in
-          rec {
-            packages = flake-utils.lib.flattenTree {
-              rofi-wayland = pkgs.rofi-wayland;
-              nix-plugins = pkgs.nix-plugins;
-              backscrub = pkgs.backscrub;
-              bl3auto = pkgs.bl3auto;
-            };
+          {
+            # packages = flake-utils.lib.flattenTree {
+            #   rofi-wayland = pkgs.rofi-wayland;
+            #   nix-plugins = pkgs.nix-plugins;
+            #   backscrub = pkgs.backscrub;
+            #   bl3auto = pkgs.bl3auto;
+            #   xmake = pkgs.xmake;
+            # };
 
-            apps = {
-              rofi-wayland = flake-utils.lib.mkApp { drv = packages.rofi-wayland; };
-              nix-plugins = flake-utils.lib.mkApp { drv = packages.nix-plugins; };
-              backscrub = flake-utils.lib.mkApp { drv = packages.backscrub; };
-            };
+            # apps = {
+            #   rofi-wayland = flake-utils.lib.mkApp { drv = packages.rofi-wayland; };
+            #   nix-plugins = flake-utils.lib.mkApp { drv = packages.nix-plugins; };
+            #   backscrub = flake-utils.lib.mkApp { drv = packages.backscrub; };
+            # };
 
             devShells.default = with pkgs;
               mkShell {
diff --git a/home-manager/modules/alacritty/default.nix b/home-manager/modules/alacritty/default.nix
index ba82123..f9d7302 100644
--- a/home-manager/modules/alacritty/default.nix
+++ b/home-manager/modules/alacritty/default.nix
@@ -21,7 +21,6 @@ in
   config = mkIf cfg.enable {
     programs.alacritty = {
       enable = true;
-      package = pkgs.hello;
 
       settings = {
         inherit (theme) colors;
diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index a29fc45..7a8850f 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -1,7 +1,5 @@
 { self, nixpkgs, nixos-hardware, hyprland, ... }:
-let
-  pkgs = import nixpkgs { system = "x86_64-linux"; };
-in
+{ pkgs, config, ... }:
 {
   imports = [
     nixos-hardware.nixosModules.common-cpu-amd
diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix
index 47911dd..11efc0d 100644
--- a/modules/greetd/default.nix
+++ b/modules/greetd/default.nix
@@ -47,7 +47,6 @@ in
           };
           "greetd/environments" = {
             text = ''
-              ${pkgs.i3}/bin/i3
               ${pkgs.sway}/bin/sway
               ${hyprland}/bin/Hyprland
               ${pkgs.bash}/bin/bash
diff --git a/users/erwin/home.nix b/users/erwin/home.nix
index ac586af..fe920c5 100644
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@@ -35,7 +35,7 @@ in
           EDITOR = "${pkgs.neovim}/bin/nvim";
         };
 
-        # nixpkgs.config = { allowUnfree = true; };
+        nixpkgs.config = { allowUnfree = true; };
 
         home.stateVersion = "21.11";