5 files changed, 45 insertions, 21 deletions

diff --git a/_sources/generated.json b/_sources/generated.json
index eeb61f3e..94acb07f 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -201,11 +201,11 @@
         "pinned": false,
         "src": {
             "name": null,
-            "sha256": "sha256-3vB6krsP6G25bviG27QI+9NyJN2YKOOmM5KhKUclJPc=",
+            "sha256": "sha256-AcWGxvXtzMiVTTWL3TmsY+tBI9vIGhRRifEjfpAGQ44=",
             "type": "url",
-            "url": "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.1.4.tar.gz"
+            "url": "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.1.5.tar.gz"
         },
-        "version": "1.1.4"
+        "version": "1.1.5"
     },
     "postfwd": {
         "cargoLocks": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 564f6cc4..ccb73776 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -122,10 +122,10 @@
   };
   postfix-mta-sts-resolver = {
     pname = "postfix-mta-sts-resolver";
-    version = "1.1.4";
+    version = "1.1.5";
     src = fetchurl {
-      url = "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.1.4.tar.gz";
-      sha256 = "sha256-3vB6krsP6G25bviG27QI+9NyJN2YKOOmM5KhKUclJPc=";
+      url = "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.1.5.tar.gz";
+      sha256 = "sha256-AcWGxvXtzMiVTTWL3TmsY+tBI9vIGhRRifEjfpAGQ44=";
     };
   };
   postfwd = {
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index a876abd5..fd876f7c 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -4,7 +4,8 @@ with lib;
 
 let
   cfg = config.home-manager.users.${userName};
-  xmonad = import ./xmonad pkgs.haskell.packages.ghc8107;
+  deHaskell = flakeInputs.nixpkgs-stable.legacyPackages.x86_64-linux.haskell.packages.ghc8107;
+  xmonad = import ./xmonad deHaskell;
   emacsScratch = pkgs.stdenv.mkDerivation (sources.emacs-scratch_el // rec {
     phases = [ "installPhase" ];
 
@@ -211,7 +212,7 @@ in {
         };
         taffybar = {
           enable = true;
-          package = import ./taffybar { haskellPackages = pkgs.haskell.packages.ghc8107; };
+          package = import ./taffybar { haskellPackages = deHaskell; };
         };
         status-notifier-watcher.enable = true;
         xembed-sni-proxy.enable = true;
diff --git a/flake.lock b/flake.lock
index 840452c1..235f6590 100644
--- a/flake.lock
+++ b/flake.lock
@@ -80,11 +80,11 @@
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1671335968,
-        "narHash": "sha256-V7mjlh7brp70elokmml6XzHinpTilkQJjiYIGjEmSGs=",
+        "lastModified": 1671966569,
+        "narHash": "sha256-jbLgfSnmLchARBNFRvCic63CFQ9LAyvlXnBpc2kwjQc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "37713c6b04b963d41664e03576f73a18c9b0d224",
+        "rev": "c55fa26ce05fee8e063db22918d05a73d430b2ea",
         "type": "github"
       },
       "original": {
@@ -133,11 +133,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1671400963,
-        "narHash": "sha256-mJGp4Ys5lfxZkoxsiCgp97Atvplr1V5o+aLd19tE1WE=",
+        "lastModified": 1672233103,
+        "narHash": "sha256-n7pu3chKPZyW3kCwbT/3ReyTiWJ5v/N1ggNarP57OWg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ba46d30d1f9a636f46fb7877008140984f5e7b75",
+        "rev": "9aa77715b71b7dd9cfbe14828eb82ae281af806c",
         "type": "github"
       },
       "original": {
@@ -149,11 +149,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1670146390,
-        "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=",
+        "lastModified": 1669833724,
+        "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "86370507cb20c905800527539fc049a2bf09c667",
+        "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1671923641,
+        "narHash": "sha256-flPauiL5UrfRJD+1oAcEefpEIUqTqnyKScWe/UUU+lE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "939c05a176b8485971463c18c44f48e56a7801c9",
         "type": "github"
       },
       "original": {
@@ -212,6 +228,7 @@
         "leapseconds": "leapseconds",
         "mach-nix": "mach-nix",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-stable": "nixpkgs-stable",
         "nvfetcher": "nvfetcher",
         "pypi-deps-db": "pypi-deps-db",
         "sops-nix": "sops-nix"
@@ -222,14 +239,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1670149631,
-        "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=",
+        "lastModified": 1671937829,
+        "narHash": "sha256-YtaNB+mLw0d67JFYNjRWM+/AL3JCXuD/DGlnTlyX1tY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "da98a111623101c64474a14983d83dad8f09f93d",
+        "rev": "855b8d51fc3991bd817978f0f093aa6ae0fae738",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 2d95f855..d098f4b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,12 @@
       repo = "nixpkgs";
       ref = "master";
     };
+    nixpkgs-stable = {
+      type = "github";
+      owner = "NixOS";
+      repo = "nixpkgs";
+      ref = "22.11";
+    };
     home-manager = {
       type = "github";
       owner = "nix-community";