configuration.nix

@@ -69,6 +69,12 @@ 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;
@@ -171,6 +177,9 @@ with pkgs;
     ./modules/periodic.nix
     ./modules/power.nix
     ./modules/monitoring.nix
+    ./overlays/nix-direnv.nix
+    ./overlays/openconnect-sso.nix
+    ./overlays/emacs-vterm.nix
   ];
 
 }

flake.lock

@@ -131,11 +131,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1693565476,
+        "lastModified": 1693471703,
-        "narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=",
+        "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b",
+        "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
         "type": "github"
       },
       "original": {

flake.nix

@@ -17,7 +17,7 @@
     };
     openconnect-sso = {
       url = "github:vlaci/openconnect-sso";
-      inputs.nixpkgs.follows = "nixpkgs";
+      flake = false;
     };
     cyrus-sasl-xoauth2 = {
       url = "github:robn/sasl2-oauth";
@@ -37,18 +37,7 @@
     let
       system = "x86_64-linux";
 
-      pkgs = import nixpkgs {
+      pkgs = import pkgs { inherit system; };
-        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;
 

modules/development.nix

@@ -3,7 +3,6 @@
 {
   # Improve nix-shell and direnv integration
   environment.pathsToLink = [ "/share/nix-direnv" ];
-  programs.direnv.enable = true;
 
   # Set up podman
   virtualisation = {

overlays/nix-direnv.nix

@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+
+with pkgs;
+
+{
+  nixpkgs.overlays = [
+    (self: super: {
+      nix-direnv = super.nix-direnv.override { enableFlakes = true; };
+    })
+  ];
+}

overlays/openconnect-sso.nix

@@ -0,0 +1,3 @@
+{ config, lib, pkgs, inputs, ... }: {
+  nixpkgs.overlays = [ (import "${inputs.openconnect-sso}/overlay.nix") ];
+}