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

@@ -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";

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
       ];

modules/x-os/networking.nix

@@ -40,10 +40,10 @@ in
     # Caddy reverse proxy for local services like cups
     services.caddy = {
       enable = true;
-      config = ''
+      globalConfig = ''
-        {
         auto_https off
-        }
+      '';
+      extraConfig = ''
         cups.local:80
         bind 127.0.0.1
         request_header Host localhost:631

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)

profiles/core/default.nix

@@ -48,7 +48,7 @@ in
         dateutils
         diffutils
         findutils
-        exfat-utils
+        exfat
         file
 
         # zippit