From f1784c0f64d571a31e7f220eadb27b92b97d1d4b Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Sun, 3 Sep 2023 01:39:26 +0200
Subject: [PATCH] Move overlays to flake definition

---
 configuration.nix            |  9 ---------
 flake.nix                    | 15 +++++++++++++--
 modules/development.nix      |  1 +
 overlays/emacs-vterm.nix     | 12 ------------
 overlays/nix-direnv.nix      | 11 -----------
 overlays/openconnect-sso.nix |  3 ---
 6 files changed, 14 insertions(+), 37 deletions(-)
 delete mode 100644 overlays/emacs-vterm.nix
 delete mode 100644 overlays/nix-direnv.nix
 delete mode 100644 overlays/openconnect-sso.nix

diff --git a/configuration.nix b/configuration.nix
index 03a328f..b98ed0a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -69,12 +69,6 @@ with pkgs;
   # Keep logs for a week
   services.journald.extraConfig = "MaxRetentionSec=1week";
 
-  # Allow propietary software and build packages with Pulseaudio support
-  nixpkgs.config = {
-    allowUnfree = true;
-    pulseaudio = true;
-  };
-
   # Scrub zpool monthly
   services.zfs.autoScrub = {
     enable = true;
@@ -177,9 +171,6 @@ with pkgs;
     ./modules/periodic.nix
     ./modules/power.nix
     ./modules/monitoring.nix
-    ./overlays/nix-direnv.nix
-    ./overlays/openconnect-sso.nix
-    ./overlays/emacs-vterm.nix
   ];
 
 }
diff --git a/flake.nix b/flake.nix
index 8929a33..9cadc14 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
     };
     openconnect-sso = {
       url = "github:vlaci/openconnect-sso";
-      flake = false;
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     cyrus-sasl-xoauth2 = {
       url = "github:robn/sasl2-oauth";
@@ -37,7 +37,18 @@
     let
       system = "x86_64-linux";
 
-      pkgs = import pkgs { inherit system; };
+      pkgs = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+        overlays = [
+          inputs.openconnect-sso.overlay
+          (final: prev: {
+            emacs-vterm =
+              ((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages
+                (epkgs: with epkgs; [ vterm ]));
+          })
+        ];
+      };
 
       lib = nixpkgs.lib;
 
diff --git a/modules/development.nix b/modules/development.nix
index 830e2bf..c6cfcd8 100644
--- a/modules/development.nix
+++ b/modules/development.nix
@@ -3,6 +3,7 @@
 {
   # Improve nix-shell and direnv integration
   environment.pathsToLink = [ "/share/nix-direnv" ];
+  programs.direnv.enable = true;
 
   # Set up podman
   virtualisation = {
diff --git a/overlays/emacs-vterm.nix b/overlays/emacs-vterm.nix
deleted file mode 100644
index d1bf739..0000000
--- a/overlays/emacs-vterm.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with pkgs;
-
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      emacs-vterm = ((emacsPackagesFor emacs29-pgtk).emacsWithPackages
-        (epkgs: with epkgs; [ vterm ]));
-    })
-  ];
-}
diff --git a/overlays/nix-direnv.nix b/overlays/nix-direnv.nix
deleted file mode 100644
index 9bef688..0000000
--- a/overlays/nix-direnv.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with pkgs;
-
-{
-  nixpkgs.overlays = [
-    (self: super: {
-      nix-direnv = super.nix-direnv.override { enableFlakes = true; };
-    })
-  ];
-}
diff --git a/overlays/openconnect-sso.nix b/overlays/openconnect-sso.nix
deleted file mode 100644
index dd4bfdc..0000000
--- a/overlays/openconnect-sso.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-  nixpkgs.overlays = [ (import "${inputs.openconnect-sso}/overlay.nix") ];
-}