update, prep for zfs

common/network/default.nix

@@ -9,7 +9,10 @@ let
 in
 {
   config = lib.mkIf (enable && network) {
-    networking.networkmanager.enable = true;
+    networking.networkmanager = {
+      enable = true;
+      plugins = with pkgs; [ networkmanager-openvpn ];  
+    };
     networking.useDHCP = lib.mkDefault true;
 
     hardware.bluetooth.enable = lib.mkDefault laptop_hardware.enable;

common/tooling/default.nix

@@ -58,6 +58,7 @@ in
 
         parted
         expect
+        gptfdisk
       ]
       ++ optionals graphical [
         wev

common/tooling/python.nix

@@ -53,7 +53,7 @@ in
             name: value: "aliases[\"${name}\"] = '''${value}'''"
           ) config.environment.shellAliases
         );
-      package = pkgs.xonsh.wrapper.override { extraPackages = pyLibs; };
+      package = pkgs.xonsh.override { extraPackages = pyLibs; };
     };
 
     grimmShared.tooling.lang_servers = [

fake_flake.nix

@@ -101,6 +101,10 @@ in
 
       config = {
         allowUnfree = true;
+        permittedInsecurePackages = [
+          "olm-3.2.16"
+          "jitsi-meet-1.0.8043"
+        ];
       };
     in
     {
@@ -116,7 +120,7 @@ in
           unpatched;
 
       overlays = [
-        (import "${nivSources.lix-module}/overlay.nix" { lix = nivSources.lix-pkg; })
+        # (import "${nivSources.lix-module}/overlay.nix" { lix = nivSources.lix-pkg; })
         (final: prev: { agenix = final.callPackage "${nivSources.agenix}/pkgs/agenix.nix" { }; })
       ];
     };

nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": null,
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "cdb74c540af1d365ea799ba5d2200df707e31090",
-        "sha256": "0pfn9fwjf6m83hk9z8nkmqrwcvd61abshbpw05v656vz5zx621ax",
+        "rev": "4d7fa422b50b612aa29bfb8487472f1cd9bad85b",
+        "sha256": "1mnsks7kibjr8kb1cjy2052kjaxrvfp5adg2ibfal7j9862042af",
         "type": "tarball",
-        "url": "https://github.com/ezKEa/aagl-gtk-on-nix/archive/cdb74c540af1d365ea799ba5d2200df707e31090.tar.gz",
+        "url": "https://github.com/ezKEa/aagl-gtk-on-nix/archive/4d7fa422b50b612aa29bfb8487472f1cd9bad85b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "agenix": {
@@ -17,10 +17,10 @@
         "homepage": "https://matrix.to/#/#agenix:nixos.org",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
-        "sha256": "09aldzzc50121p0b3apj2c0l71jgmbif46a76shlgps8wbbbkr35",
+        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "sha256": "1x8nd8hvsq6mvzig122vprwigsr3z2skanig65haqswn7z7amsvg",
         "type": "tarball",
-        "url": "https://github.com/ryantm/agenix/archive/3f1dae074a12feb7327b4bf43cbac0d124488bb7.tar.gz",
+        "url": "https://github.com/ryantm/agenix/archive/f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "authentik-nix": {
@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "authentik-nix",
-        "rev": "89cfaf2eb197a39d12422e773f867d1a7c99b048",
-        "sha256": "1405rzwq8fwpyc63ac76f50glc00sp18m2ska1najzqvzi9v5zpk",
+        "rev": "39cf62b92149800dd2a436f8b18acd471c9180dd",
+        "sha256": "07zkf00c5zw62709lmyh0kn0g9rbfd7qn8qfxhr4p0p3y59wiz7x",
         "type": "tarball",
-        "url": "https://github.com/nix-community/authentik-nix/archive/89cfaf2eb197a39d12422e773f867d1a7c99b048.tar.gz",
+        "url": "https://github.com/nix-community/authentik-nix/archive/39cf62b92149800dd2a436f8b18acd471c9180dd.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "chaotic": {
@@ -41,10 +41,10 @@
         "homepage": "https://nyx.chaotic.cx",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "14758e216e5312a6e964c479e461e85ce428e99b",
-        "sha256": "0j46dyrl8z2hrj0d1vrvl29rivf5ifq8n76csvcysj96ig8knlk5",
+        "rev": "86e3fe5d4ae055f99e3ce41b803dcfb5e66cc008",
+        "sha256": "1ha6hxf0l6z5x8px0yc0vmvvqycy3pcx08f0mldzcbmx7gfhsq17",
         "type": "tarball",
-        "url": "https://github.com/chaotic-cx/nyx/archive/14758e216e5312a6e964c479e461e85ce428e99b.tar.gz",
+        "url": "https://github.com/chaotic-cx/nyx/archive/86e3fe5d4ae055f99e3ce41b803dcfb5e66cc008.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "glibc-eac": {
@@ -62,19 +62,19 @@
     "lix-module": {
         "branch": "main",
         "repo": "https://git.lix.systems/lix-project/nixos-module.git",
-        "rev": "e350380d72f94035c309e19fda2fd550f6ab7376",
+        "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9",
         "type": "git"
     },
     "lix-pkg": {
         "branch": "main",
         "repo": "https://git.lix.systems/lix-project/lix.git",
-        "rev": "61a93d53081141d4ab222dcb939dd5caa8ffc767",
+        "rev": "a510d1748416ff29b1ed3cab92ac0ad943b6e590",
         "type": "git"
     },
     "nixos-mailserver": {
         "branch": "master",
         "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git",
-        "rev": "059b50b2e729729ea00c6831124d3837c494f3d5",
+        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
         "type": "git"
     },
     "nixos-matrix-modules": {
@@ -83,10 +83,10 @@
         "homepage": null,
         "owner": "dali99",
         "repo": "nixos-matrix-modules",
-        "rev": "d7dc42c9bbb155c5e4aa2f0985d0df75ce978456",
-        "sha256": "10q5is4fkmiqqfrmvvv92qkfv1iizariklbvazx00n9qvi2qlp1h",
+        "rev": "f4e20d03605c21aebb325c936f3283c322d7e975",
+        "sha256": "1jj0rxahi3f9ypb3csz3q7jcr556iqbqifb4h9p632hl5prac9rl",
         "type": "tarball",
-        "url": "https://github.com/dali99/nixos-matrix-modules/archive/d7dc42c9bbb155c5e4aa2f0985d0df75ce978456.tar.gz",
+        "url": "https://github.com/dali99/nixos-matrix-modules/archive/f4e20d03605c21aebb325c936f3283c322d7e975.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
@@ -95,10 +95,10 @@
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
-        "sha256": "0c72qyi7xm12cvasj5jwnq41sykfd67m4qy7d9kya2bbmcil2cpw",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+        "sha256": "1b47065q41ar9585ra4akb4s4kjwcs3p3g4chrpps8704vz7nx0s",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/9f918d616c5321ad374ae6cb5ea89c9e04bf3e58.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/71e91c409d1e654808b2621f28a327acfdad8dc2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "ranger_udisk_menu": {

specific/grimm-nixos-laptop/configuration.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
   imports = [
     # Include the results of the hardware scan.
@@ -9,6 +9,12 @@
 
   age.identityPaths = [ "/home/grimmauld/.ssh/id_ed25519" ];
 
+
+  services.zfs.trim.enable = true;
+  boot.supportedFilesystems.zfs = true;
+  networking.hostId = "2ea79333";
+  boot.kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages;
+
   grimmShared = {
     tooling = {
       pass = true;