Fix flake and update to the nixpkgs 22_05 tag

flake.lock

@@ -7,7 +7,7 @@
         ]
       },
       "locked": {
-        "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
+        "narHash": "sha256-T4at7d+KsQNWh5rfjvOtQCaIMWjSDlSgQZKvxb+LcEY=",
         "type": "tarball",
         "url": "https://github.com/nix-community/home-manager/archive/release-22.05.tar.gz"
       },
@@ -18,11 +18,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1662458987,
+        "lastModified": 1665649208,
-        "narHash": "sha256-hcDwRlsXZMp2Er3vQk1JEUZWhBPLVC9vTT4xHvhpcE0=",
+        "narHash": "sha256-MDkPVG4W8gigJ8OxWDp9L6aKaEwLRV3As1RvKkMq0rc=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "504b32caf83986b7e6b9c79c1c13008f83290f19",
+        "rev": "d92ed98c099ae731664fc526c348d609c4cffe04",
         "type": "github"
       },
       "original": {
@@ -34,11 +34,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1662099760,
+        "lastModified": 1653936696,
-        "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=",
+        "narHash": "sha256-M6bJShji9AIDZ7Kh7CPwPBPb/T7RiVev2PAcOi4fxDQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "67e45078141102f45eff1589a831aeaa3182b41e",
+        "rev": "ce6aa13369b667ac2542593170993504932eb836",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662390490,
+        "lastModified": 1665289655,
-        "narHash": "sha256-HnFHRFu0eoB0tLOZRjLgVfHzK+4bQzAmAmHSzOquuyI=",
+        "narHash": "sha256-j1Q9mNBhbzeJykhObiXwEGres9qvP4vH7gxdJ+ihkLI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "044ccfe24b349859cd9efc943e4465cc993ac84e",
+        "rev": "0ce0449e6404c4ff9d1b7bd657794ae5ca54deb3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -34,13 +34,15 @@
   }: let
     system = "x86_64-linux";
     homeManagerConfFor = config: { ... }: {
-      #nixpkgs.overlays = [ nur.overlay ];
       imports = [ config ];
     };
     jacobHome = homeManagerConfFor ./home/jacob.nix;
     jacobHomeMod = {
-      home-manager.useUserPackages = true;
+      home-manager = {
-      home-manager.users.jacob = jacobHome;
+        useGlobalPkgs = true;
+        useUserPackages = true;
+        users.jacob = jacobHome;
+      };
     };
     mkNixosSystem = extraModules: nixpkgs.lib.nixosSystem {
       inherit system;

machines/buck/configuration.nix

@@ -2,11 +2,10 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, inputs, sops, ... }:
-
 {
   config,
   pkgs,
+  inputs,
   sops,
   ...
 }: {

machines/pedro/configuration.nix

@@ -68,47 +68,8 @@
         };
       };
     };
-<<<<<<< HEAD
     firewall = import ./firewall.nix;
     timeServers = [ "192.168.88.1" ] ++ options.networking.timeServers.default;
-=======
-    firewall = {
-      allowedTCPPorts = [
-        8384
-        22000 # syncthing
-        8080
-        8443
-        6789
-        8880
-        8843
-        27117 # unifi controller: https://help.ui.com/hc/en-us/articles/218506997-UniFi-Network-Required-Ports-Reference
-        53
-        8088 # pihole
-        #3000  # gitea
-        #8081  # vaultwarden
-        #8000  # paperless
-        80
-        443 # reverse proxy
-      ];
-      allowedUDPPorts = [
-        22000
-        21027 # syncthing
-        3478
-        5514
-        10001
-        1900
-        123 # unifi
-        53 # pihole
-      ];
-      allowedUDPPortRanges = [
-        {
-          from = 5656;
-          to = 5699;
-        } # unifi
-      ];
-    };
-    timeServers = ["192.168.88.1"] ++ options.networking.timeServers.default;
->>>>>>> 337a41901fccf4591c5315525a74e6e52d33589c
   };
 
   hardware.video.hidpi.enable = false;
@@ -119,13 +80,6 @@
   #package = pkgs.pulseaudioFull;
   #};
   hardware.bluetooth.enable = false;
-<<<<<<< HEAD
-=======
-  services.blueman.enable = false;
-
-  # Enable CUPS to print documents.
-  services.printing.enable = false;
->>>>>>> 337a41901fccf4591c5315525a74e6e52d33589c
 
   # Enable sound.
   sound.enable = false;