From aabfc4a0ddaadcf2bc3d750e99efa847814ac2ef Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 2 Jun 2022 10:09:42 +0200
Subject: [PATCH] nixos: follow release-22.05

home: follow release-22.05 branch

Fixes for upstream changes:

ag renamed to silver-searcher, extfat-utils is now exfat, lot's of
overrides no longer needed, as they're now in the release branch,
services.caddy.config split up into globalConfig and extraConfig
---
 flake.nix                         |  4 ++--
 modules/terminal-life/default.nix |  2 +-
 modules/x-os/networking.nix       |  8 ++++----
 overlays/overrides.nix            | 14 --------------
 profiles/core/default.nix         |  2 +-
 5 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6d094df3..ac567b20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
   inputs =
     {
       # Track channels with commits tested and built by hydra
-      nixos.url = "github:nixos/nixpkgs/nixos-21.11";
+      nixos.url = "github:nixos/nixpkgs/nixos-22.05";
       latest.url = "github:nixos/nixpkgs/nixos-unstable";
       master.url = "github:nixos/nixpkgs/master";
 
@@ -22,7 +22,7 @@
       bud.inputs.nixpkgs.follows = "nixos";
       bud.inputs.devshell.follows = "digga/devshell";
 
-      home.url = "github:nix-community/home-manager/master";
+      home.url = "github:nix-community/home-manager/release-22.05";
       home.inputs.nixpkgs.follows = "nixos";
 
       darwin.url = "github:LnL7/nix-darwin";
diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 7cc604c9..4005519e 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -26,7 +26,6 @@ in
       home.packages = [
         ack
         asciinema
-        ag
         asciinema
         bat
         exa
@@ -37,6 +36,7 @@ in
         nnn
         powerline
         python-wiki-fetch
+        silver-searcher
         vifm
         watson
       ];
diff --git a/modules/x-os/networking.nix b/modules/x-os/networking.nix
index 1e981290..347fe750 100644
--- a/modules/x-os/networking.nix
+++ b/modules/x-os/networking.nix
@@ -40,10 +40,10 @@ in
     # Caddy reverse proxy for local services like cups
     services.caddy = {
       enable = true;
-      config = ''
-        {
-          auto_https off
-        }
+      globalConfig = ''
+        auto_https off
+      '';
+      extraConfig = ''
         cups.local:80
         bind 127.0.0.1
         request_header Host localhost:631
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 1931552e..29ba2d57 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -14,21 +14,7 @@ channels: final: prev: {
     starship
     deploy-rs
 
-    docker
-    docker-compose_2
-    flameshot
-    metal-cli
-    nomad
-    qMasterPassword
-    vagrant
-    nixUnstable
-    neovim-unwrapped
     tdesktop
-    obs-studio
-    obs-studio-plugins
-    looking-glass-client
-    nix-direnv
-    vimPlugins
     ;
 
   inherit (channels.master)
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index d283bfb0..046da293 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -48,7 +48,7 @@ in
         dateutils
         diffutils
         findutils
-        exfat-utils
+        exfat
         file
 
         # zippit