Merge branch 'b12f' of git.pub.solar:pub-solar/os into b12f

2023-06-01 18:10:27 +02:00 · 2023-06-01 18:10:27 +02:00 · 39ff71b6d3
parent dcb77f9056 5aa65b766f
commit 39ff71b6d3
7 changed files with 114 additions and 589 deletions
--- a/flake.lock
+++ b/flake.lock
@ -1,589 +0,0 @@
-{
-  "nodes": {
-    "agenix": {
-      "inputs": {
-        "darwin": [
-          "darwin"
-        ],
-        "nixpkgs": [
-          "nixos"
-        ]
-      },
-      "locked": {
-        "lastModified": 1680281360,
-        "narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "e64961977f60388dd0b49572bb0fc453b871f896",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
-        "type": "github"
-      }
-    },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixos"
-        ]
-      },
-      "locked": {
-        "lastModified": 1680266963,
-        "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=",
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "rev": "99d4187d11be86b49baa3a1aec0530004072374f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "deno2nix": {
-      "inputs": {
-        "devshell": "devshell_2",
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1675869640,
-        "narHash": "sha256-HkSiT3VWfHaAUa/usB6+ywXKejZI7bh6yIoh2bTa0eE=",
-        "ref": "refs/heads/main",
-        "rev": "0b54d6ce4424039951c1c12cc4319836b76c1eaf",
-        "revCount": 32,
-        "type": "git",
-        "url": "https://git.pub.solar/b12f/deno2.nix.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.pub.solar/b12f/deno2.nix.git"
-      }
-    },
-    "deploy": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "nixpkgs": [
-          "nixos"
-        ],
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1674127017,
-        "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=",
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77",
-        "type": "github"
-      },
-      "original": {
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "type": "github"
-      }
-    },
-    "devshell": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "digga",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1671489820,
-        "narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "devshell_2": {
-      "inputs": {
-        "flake-utils": [
-          "scan2paperless",
-          "deno2nix",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "scan2paperless",
-          "deno2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1667210711,
-        "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "devshell_3": {
-      "inputs": {
-        "flake-utils": [
-          "scan2paperless",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "scan2paperless",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1675790942,
-        "narHash": "sha256-UfXATFXxACtdMQmwRZIdOc6CT4mwgbZBAnGxiUkgUM4=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "6fe837bb4f540a1832522ec54604c453757836b2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "digga": {
-      "inputs": {
-        "darwin": [
-          "darwin"
-        ],
-        "deploy": [
-          "deploy"
-        ],
-        "devshell": "devshell",
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-utils": "flake-utils_2",
-        "flake-utils-plus": "flake-utils-plus",
-        "home-manager": [
-          "home"
-        ],
-        "nixlib": [
-          "nixos"
-        ],
-        "nixpkgs": [
-          "nixos"
-        ],
-        "nixpkgs-unstable": "nixpkgs-unstable"
-      },
-      "locked": {
-        "lastModified": 1674947971,
-        "narHash": "sha256-6gKqegJHs72jnfFP9g2sihl4fIZgtKgKuqU2rCkIdGY=",
-        "owner": "pub-solar",
-        "repo": "digga",
-        "rev": "2da608bd8afb48afef82c6b1b6d852a36094a497",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pub-solar",
-        "ref": "fix/bootstrap-iso",
-        "repo": "digga",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1642700792,
-        "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils-plus": {
-      "inputs": {
-        "flake-utils": [
-          "digga",
-          "flake-utils"
-        ]
-      },
-      "locked": {
-        "lastModified": 1654029967,
-        "narHash": "sha256-my3GQ3mQIw/1f6GPV1IhUZrcYQSWh0YJAMPNBjhXJDw=",
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "6271cf3842ff9c8a9af9e3508c547f86bc77d199",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gytis-ivaskevicius",
-        "ref": "refs/pull/120/head",
-        "repo": "flake-utils-plus",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "home": {
-      "inputs": {
-        "nixpkgs": [
-          "nixos"
-        ],
-        "utils": "utils_2"
-      },
-      "locked": {
-        "lastModified": 1679738842,
-        "narHash": "sha256-CvqRbsyDW756EskojZptDU590rez29RcHDV3ezoze08=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "83110c259889230b324bb2d35bef78bf5f214a1f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-22.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "latest": {
-      "locked": {
-        "lastModified": 1680213900,
-        "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "master": {
-      "locked": {
-        "lastModified": 1680514745,
-        "narHash": "sha256-5RUDdGhHxKKgHzzroHXuQkEu5S0lNxWyvxyzK6PHCCg=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "d846d8e2ec0461a141c01087d304502ddb341664",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixlib": {
-      "locked": {
-        "lastModified": 1679187309,
-        "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "44214417fe4595438b31bdb9469be92536a61455",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixos": {
-      "locked": {
-        "lastModified": 1680334310,
-        "narHash": "sha256-ISWz16oGxBhF7wqAxefMPwFag6SlsA9up8muV79V9ck=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "884e3b68be02ff9d61a042bc9bd9dd2a358f95da",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixos-generators": {
-      "inputs": {
-        "nixlib": "nixlib",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1679464055,
-        "narHash": "sha256-RiZpwkbm1GeKRqrTtGGsEDieJyplMSRG1bQzOZgY378=",
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "rev": "d5cd198c80ee62a801a078ad991c99c0175971cf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "type": "github"
-      }
-    },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1680070330,
-        "narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=",
-        "owner": "nixos",
-        "repo": "nixos-hardware",
-        "rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1679198465,
-        "narHash": "sha256-VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5a05160f7671434e1c833b1b01284b876e04eca4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1672791794,
-        "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1670332253,
-        "narHash": "sha256-O5SmhlIUt1s+vK4NXeGYqwcBIMwbBPAEZ3GHE3XT28c=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1c9ffcf70786f0966982ce0fc76ec05df2e1dec2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1675763311,
-        "narHash": "sha256-bz0Q2H3mxsF1CUfk26Sl9Uzi8/HFjGFD/moZHz1HebU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "fab09085df1b60d6a0870c8a89ce26d5a4a708c2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "pub-solar": {
-      "locked": {
-        "lastModified": 1654372286,
-        "narHash": "sha256-z1WrQkL67Sosz1VnuKQLpzEkEl4ianeLpWJX8Q6bVQY=",
-        "owner": "pub-solar",
-        "repo": "nixpkgs",
-        "rev": "4995a873a796c54cc49e5dca9e1d20350eceec7b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pub-solar",
-        "ref": "fix/use-latest-unstable-yubikey-agent",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "agenix": "agenix",
-        "darwin": "darwin",
-        "deploy": "deploy",
-        "digga": "digga",
-        "flake-compat": "flake-compat",
-        "home": "home",
-        "latest": "latest",
-        "master": "master",
-        "nixos": "nixos",
-        "nixos-generators": "nixos-generators",
-        "nixos-hardware": "nixos-hardware",
-        "pub-solar": "pub-solar",
-        "scan2paperless": "scan2paperless"
-      }
-    },
-    "scan2paperless": {
-      "inputs": {
-        "deno2nix": "deno2nix",
-        "devshell": "devshell_3",
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1675874729,
-        "narHash": "sha256-FhoV70g+H83XYxD5jF3963t4k7u967c/nZudHhTgxB0=",
-        "ref": "refs/heads/main",
-        "rev": "7ec158e547377bbe3a6dd7b5a2f6e141834d4c94",
-        "revCount": 8,
-        "type": "git",
-        "url": "https://git.pub.solar/b12f/scan2paperless.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.pub.solar/b12f/scan2paperless.git"
-      }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_2": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
--- a/hosts/biolimo/biolimo.nix
+++ b/hosts/biolimo/biolimo.nix
@ -23,6 +23,10 @@ in {

    networking.networkmanager.wifi.backend = mkForce "wpa_supplicant";

+    services.printing.drivers = [
+      pkgs.cups-brother-hl3140cw
+    ];
+
    home-manager = with pkgs;
      pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
        xdg.configFile = mkIf psCfg.sway.enable {
--- a/secrets/.fwknoprc
+++ b/secrets/.fwknoprc
@ -0,0 +1,55 @@
+age-encryption.org/v1
+-> ssh-rsa kFDS0A
+LOCwn3fjnFMa4uQSQ07PtaacV9m9SsIwdoFEjw5TA97x8oB6NiEtLBXDlJjmdlaa
+FXAbXM8jLWKibGNdTeKZHpArHqdGDq3nsfyhnX6yBtPGFPAe1UKve05nlyttu4D5
+fthzMbAcQ64mKG6+nOKGHvI81GOMBJtRxGt5ZQLCc/xb27tE+LFobFPQY6YgdeD3
+IyOpJGkpc3xAgSO69EWJZg4Ghwha94sZEKKrqQr1fTeLS4UtwjVrVbNheYL7W1sS
+jcfq8oXZXD0VARODA4k+bM1/XvLsWcXQBaIeLwgCsjuIjnbczHIiRI2+j3Ob26JQ
+hslibSZCcd62zffjPHHZnOfMfZdqNlD/QHHwiI61rI64b5OMfRziN6k6e1cycl6p
+Na75U+mQwFm9nl3fLJBlEXAwhlZIjlDUMxT6o6T2ship9uEb9SauKnP9f7ZeHqVF
+uADkMatkE094YWfPnOVJz1eqCx3MbyLCl2JT81QrtNjO3kg8RQVH+Uyfa02fAPp/
+85AwQH+TP9zOihVjtdLXcOw0w7vZnxR63pG9M76wM9mdD3ZNrrhGE3ZGVJ2S49UP
+hlXO08A1L186Laz/Gkl0e7lNJW5zi3nkoNXj83jcOF62PYlLOFEW/qX6I6wNj+M0
+yKeYpQApPXJ51eBkXPB9Bhfj8ftxeLv4fH0bsQhqU1w
+-> ssh-ed25519 TnSWKQ Hk4SpOst8GGEYmTKiCCYyo2tms9h3dufpFqAhiJgpiA
+1RHyW45dojLPWKNxmnSqr+zj3qSRSFkl9qGWLnEq8K0
+-> ssh-rsa 8daibg
+MNcF/av+TW6ud3eQ6aVZmE2b2sY1nYoaTanxXUzPQO6PPHvnr4CgqgWxZKbt6YHY
+0fAYPgJbiqqjNFQbVHryAcQeMXD+tAyuKlm26Y2ClZMIYKq8+bkIk564hTwsXrzS
+kGdioExuFEksU82e/q+zofyf4W0du4VrM046WTtluX1GPsHk9aIvF7B0WHI9+hR7
+3uXHEBgSgaA7AC4hXUIXA69p4tNSnyJdifJ1hPj3Kheu8NUvn4r8wUyoKqcQuK6Q
+88x2eKjtcejXRiH38AzlyPPTkU4mzPWIU8CjrYVEDTHXC0RXlNnRbeAe4ELipLBr
+Yx08KrUSbY6CHJvS4AWjHEzDbzm4lOpww38psGDu50Z6eA33wjJThXfjpDnB2fEO
+ru8qwbGv+kYMvWKs/5ZQeQ1hq+F5qna5M9I8fu4WdIV9k7emRD8debvlBNYXJtw5
+w2AyIYJK+IEhQkuKjVeZHzBmQ23zSS7pCM9vandZhFixkqRk3g+ZqTwGGishFED6
+SaUf9R/eQSVnVSB8skQ9En08it/XBgGuKjRWLHgU6OZkkVKXuj1Mh9Iv9QAU0fQ4
+3EibmCBZUxS9B1VPBE+cjYFY53pFRM5sHrLAehC4O1WaM8y2jz0K03lBjyVJOeSw
+qIBFrLOu6Gqn1fJYrFa2LBLG/PN2uNIhZSh/yCfhfQ0
+-> ssh-rsa kFDS0A
+BhxxIOUw7LuHNJPaXmlUW0mM0HnBAZgeiXWjE02BvQF1C+9EapRBbXjuhadvDr4J
+VSDC6GF7BeX6J7f1tBV9go7orZJiNVPIU2nhopriT5oXrOH/ZD2/6ADA6KVLVuUU
+/I/vTbnx8GDqF7N3OlZb8/mxiRMv+d/7zgO9vcDU5VVo5FuE9LB5e8JKuXrj7sTG
+RPkkX9aBISs48RooFBDuDbddGZ9tq71OcCqofmOT0IoTOpPSkoZWl0EHorELh9yt
+n8iy9IsGuLKpcih1ZFUWQnmLHAWYIVM7y8eg/Rs6wGUWZog2ptx+BRPlh6loO8fD
+TzcsBs68TzVUq/Xr3kZ5PJIsEwLo9eWrOj4s3TEL4VyOty1KN73CF7piWd8a6fYU
+qDqPuIyGho1A0uolxcj3qKG4WAofgsdSwmaOpNSSGaETsq8kJujAtjywstvrcGfh
+sDjXv9aNp2833mROUzzF4AAlnCn0Kioc6MW0k0bB2lX0Msj9SzRLq49956v76c3b
+zimQGZ90So/CyIVlYlMHFR1QQB106I8ZP/6Tsmb5ct3/A+X8D65oLT+FzqT+cReX
+glLB7lHG49fx54ot7l6o0UgEu9KBUkMs+Ry/j4VyaKw7bsmhGJ2jLxm08L/d8t3Y
+EOTPxRHCYBfeGkgLH8gcLSoaA0HX0JYXBtxJYjlPZI0
+-> ssh-ed25519 2Ca8Kg vgCvJblRQLnUuN4uV3TFABstwM8CgpWqSMydVwuF1w0
+63r7HmUw1mvnUAZCP4cJEipc1Ff+BV4ENV+iRbeC8dU
+-> ssh-rsa 2ggJWw
+Ch+8asbOfiFxBlO0CtfJcZmIwRRLhSYVf6a6qDXxWeXg47ifRGZNgv7VMLrM+W5N
+L38EgtpXO077tUkurzU522Wbm3ZJolFHzB6+3hp7Sxy6UHutB8j15dS6liJN2FAH
+5fjST+AFwg9M24OGcTiVU+lbkgXEM606WrC17HPRigJvaarfgZtm1WtpH4dboPdM
+vEZYsLJkAydvZynL7WM17bwcNX6fGsKCT/pkJfNDizifsEwp35uu7JZr2rYePHRY
+iZV5WfH3ZQROKcnx5R+7xEAWvFXwaWjm3fxAXegz/orjNSDtXW/ujbhglQW/hnUP
+efcj8aTkxGP/jkM8cQ8A1USZ8jyR8JlurHRa7hfA3kBzlOwzUOf35oannyOztWNl
+tRWmQjQBxMPyRCOq5nZXWV/qxtKqcE6qyi10f5bIMPk1znglwNS5uZbmx/uHIWju
+nzrqNYIwEcYd4pFqKSAN+UIZ0/3HB9HPaVQQSNKFcWA4Y5FxDh+gBfwqVM1SVbRA
+
+-> _".6-grease k-v mG|Rm] FM?
+Q4BYtrvYJvW5t+FeOAHASFLQN9uWC/IiwHfaQi9riQZFR/RJYPdNxkFb
+--- P2DlzX4CKd3JbcQPpMuAID9XoB+f5H0EIndBWYWlSBY
+«–3¼‹0@ýÜt+Þ5n¦yÞ-u¾#Ž6Ó'¹Ýš
%LòÁù‰Ì;ãÅak!”?I›Âö;%²vm8AÞ4Ë{‚¨‹ªŸÕàÖ^oÌÄ<C38C>ôÔáÍxFª
ì‹5Kìó¸r¹Øâ¿“@D¡IŸ><3E>…ÂG»”/²ôó~§î¶682~$ï…Á2<C381>ª
--- a/secrets/cat-test.ovpn
+++ b/secrets/cat-test.ovpn
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@ -2,6 +2,9 @@ let
  # set ssh public keys here for your system and user
  bbcom = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmXpOU6vzQiVSSYCoxHYv7wDxC63Qg3dxlAMR6AOzwIABCU5PFFNcO0NWYms/YR7MOViorl+19LCLRABar9JgHU1n+uqxKV6eGph3OPeMp5sN8LAh7C9N+TZj8iJzBxQ3ch+Z/LdmLRwYNJ7KSUI+gwGK6xRS3+z1022Y4P0G0sx7IeCBl4lealQEIIF10ZOfjUdBcLQar7XTc5AxyGKnHCerXHRtccCoadLQujk0AvPXbv3Ma4JwX9X++AnCWRWakqS5UInu2tGuZ/6Hrjd2a9AKWjTaBVDcbYqCvY4XVuMj2/A2bCceFBaoi41apybSk26FSFTU4qiEUNQ6lxeOwG4+1NCXyHe2bGI4VyoxinDYa8vLLzXIRfTRA0qoGfCweXNeWPf0jMqASkUKaSOH5Ot7O5ps34r0j9pWzavDid8QeKJPyhxKuF1a5G4iBEZ0O9vuti60dPSjJPci9oTxbune2/jb7Sa0yO06DtLFJ2ncr5f70s/BDxKk4XIwQLy+KsvzlQEGdY8yA6xv28bOGxL3sQ0HE2pDTsvIbAisVOKzdJeolStL9MM5W8Hg0r/KkGj2bg0TfoRp1xHV9hjKkvJrsQ6okaPvNFeZq0HXzPhWMOVQ+/46z80uaQ1ByRLr3FTwuWJ7F/73ndfxiq6bDE4z2Ji0vOjeWJm6HCxTdGw== hello@benjaminbaedorf.com";

+  yubi-main = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHx4A8rLYmFgTOp1fDGbbONN8SOT0l5wWrUSYFUcVzMPTyfdT23ZVIdVD5yZCySgi/7PSh5mVmyLIZVIXlNrZJg= @b12f Yubi Main";
+  yubi-backup = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEST9eyAY3nzGYNnqDYfWHu+89LZsOjyKHMqCFvtP7vrgB7F7JbbECjdjAXEOfPDSCVwtMMpq8JJXeRMjpsD0rw= @b12f Yubi Backup";
+
  biolimo-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBZzg8pfVtFonx/IvO2MKG5uVF/sMJAOt1Ifm9Vds2eA root@biolimo";
  biolimo-user = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDoYNvXWunQYFORRjcYH1F98+zr20U79ROh+gmaC7AY/x3yf4y8uyMayF56VgQLVNwgEchT5t4dNb9qo2+1oUnjiKrKAVfQMN6WMMMEr4F4WT784uvBx5Uo6vmhgAa+xoo62c4TV2Uf49ZiPd+zAApBHW1F/whPtunPF28Wfr9g+ozSidhnAr+3nkfJh331tz9s+wgQ39AFzFWftQ60Guulpfj8SaVyxyv/yZZAuFpXNzN0Cz4fWBIWFOsib6Z8y+SlUCzSzOguZ7FygHjwlvOxoISsASAuf0OfUKHxVshiL5F5AX1ddmUgXbUKUTp/3Iunr74pfOQC8TXzZHqhrlFzYDmK5J9E6eADSpgx++bCCaHycl73BWeertCBZSHBXeb3Db9HX+mxwpfP3alVAt4ZqQb3YD/VB7XGDvHbmLn+wSfecO2qA9PxiA0yX7e2BZLN9r3G3bRNSk0GpnYM0i84FE9IipiKKnWVjj7J0UPQmz7rzAn2Lki1CnX9PDdxZneqTxgpBomHJt4H+vXMw13scA4xxEDBvfS5KkjbEJqWLbfklCoER6nV3NPLZ6CBl0Xe/VQBSkqEuUEIXih/oa8emDOGUODNF75ck5NJmKiGg6AFZoeiDa7PZMIxhhOq4vsR2Ty43rztUJ0CMX7iSIk3Eql7kqNdvrJaJ7z0GBsiw== ben@biolimo";

@ -58,4 +61,8 @@ in {
  "mopidy.conf".publicKeys = allKeys;

  "b12f-env-secrets".publicKeys = biolimoKeys ++ chocolatebarKeys;
+
+  ".fwknoprc".publicKeys = biolimoKeys ++ chocolatebarKeys;
+
+  "cat-test.ovpn".publicKeys = biolimoKeys ++ chocolatebarKeys;
 }
--- a/users/ben/concepts-and-training.nix
+++ b/users/ben/concepts-and-training.nix
@ -0,0 +1,47 @@
+{
+  config,
+  pkgs,
+  lib,
+  self,
+  ...
+}:
+with lib; let
+  psCfg = config.pub-solar;
+  xdg = config.home-manager.users."${psCfg.user.name}".xdg;
+in {
+  age.secrets."cat-test.ovpn" = {
+    file = "${self}/secrets/cat-test.ovpn";
+    mode = "700";
+    owner = psCfg.user.name;
+  };
+
+  age.secrets.".fwknoprc" = {
+    file = "${self}/secrets/.fwknoprc";
+    mode = "600";
+  };
+
+  services.openvpn.servers = {
+    catVPN = {
+      config = ''config ${config.age.secrets."cat-test.ovpn".path}'';
+    };
+  };
+
+  systemd.services.openvpn-catVPN.serviceConfig.ExecStartPre = "${pkgs.fwknop}/bin/fwknop --rc-file=${config.age.secrets.".fwknoprc".path} --no-save-args --no-home-dir --save-args-file=/dev/null -n hetzner_test_cloud --wget-cmd=${pkgs.wget}/bin/wget";
+
+  home-manager = pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
+    programs.ssh = {
+      matchBlocks = {
+        "salt.base.test" = {
+          hostname = "10.0.0.2";
+          user = "bbaedorf";
+        };
+
+        "salt.gateway.test" = {
+          hostname = "10.0.0.3";
+          user = "root";
+          proxyJump = "root@salt.base.test";
+        };
+      };
+    };
+  };
+}
--- a/users/ben/home.nix
+++ b/users/ben/home.nix
@ -11,6 +11,7 @@ with lib; let
 in {
  imports = [
    ./session-variables.nix
+    ./concepts-and-training.nix
  ];

  home-manager = pkgs.lib.setAttrByPath ["users" psCfg.user.name] {