router: firewall: proper filtering for hosts proxied by cloudflare

router: dns: add more upstream providers; add sysdomain hosts for truenas, debbi, etappi
router: refactor config into separate files, add workaround for networkd issues
2025-03-26 00:24:16 -07:00 · 2025-03-26 00:21:19 -07:00 · 2025-03-26 00:18:45 -07:00 · 2025-03-25 20:58:32 -07:00 · 2025-03-13 10:56:20 -07:00 · 2025-03-04 21:29:09 -08:00
32 changed files with 1765 additions and 1073 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
 # Default ignored files
 /shelf/
 /workspace.xml
 # Editor-based HTTP Client requests
 /httpRequests/
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
  <state>
    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
  </state>
 </component>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
 <component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
  </profile>
 </component>
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
 <component name="InspectionProjectProfileManager">
  <settings>
    <option name="USE_PROJECT_PROFILE" value="false" />
    <version value="1.0" />
  </settings>
 </component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="Black">
    <option name="sdkName" value="Python 3.12" />
  </component>
  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12" project-jdk-type="Python SDK" />
 </project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/.idea/nix-conf.iml" filepath="$PROJECT_DIR$/.idea/nix-conf.iml" />
    </modules>
  </component>
 </project>
--- a/.idea/nix-conf.iml
+++ b/.idea/nix-conf.iml
@@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
  <component name="NewModuleRootManager">
    <content url="file://$MODULE_DIR$" />
    <orderEntry type="jdk" jdkName="Python 3.12" jdkType="Python SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
    <mapping directory="$PROJECT_DIR$" vcs="Git" />
  </component>
 </project>
--- a/flake.lock
+++ b/flake.lock
@@ -1,297 +1,17 @@
 {
  "nodes": {
    "chaotic": {
      "inputs": {
        "flake-schemas": "flake-schemas",
        "home-manager": "home-manager",
        "jovian": "jovian",
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
        "lastModified": 1734346739,
        "narHash": "sha256-Um5yY36idRodddotyBaI9sQjw/xw5SV6tt3jPRgL330=",
        "owner": "chaotic-cx",
        "repo": "nyx",
        "rev": "7228d7032f0316dbc69b69584ec07707efbd38c9",
        "type": "github"
      },
      "original": {
        "owner": "chaotic-cx",
        "ref": "nyxpkgs-unstable",
        "repo": "nyx",
        "type": "github"
      }
    },
    "classified": {
      "inputs": {
        "flake-utils": "flake-utils",
        "naersk": "naersk",
        "nixpkgs": [
          "ollama",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1695834857,
        "narHash": "sha256-8B4rWpXvqKY8YGehNlABu/E22HIw5Xej2SgxMXt/BJw=",
        "owner": "GoldsteinE",
        "repo": "classified",
        "rev": "7fde1d5ef009d3860a357dce250c0b1e694293cd",
        "type": "github"
      },
      "original": {
        "owner": "GoldsteinE",
        "repo": "classified",
        "type": "github"
      }
    },
    "comoji": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "nixpkgs"
        ],
        "utils": "utils"
      },
      "locked": {
        "lastModified": 1720509565,
        "narHash": "sha256-yZ0yj6jzLtaaAuJgphoBQOJytxwOysHhZ/qJLf4KDJ0=",
        "owner": "MordragT",
        "repo": "comoji",
        "rev": "beb26945a125a08c6ed68bd1fa3dee609e9410db",
        "type": "github"
      },
      "original": {
        "owner": "MordragT",
        "repo": "comoji",
        "type": "github"
      }
    },
    "cosmic": {
      "inputs": {
        "flake-compat": "flake-compat",
        "nixpkgs": "nixpkgs_3",
        "nixpkgs-stable": "nixpkgs-stable",
        "rust-overlay": "rust-overlay"
      },
      "locked": {
        "lastModified": 1734404414,
        "narHash": "sha256-c/7bsbMcVMb8c4wiLA142ZQfL08U8qYJROGf9NCkfQE=",
        "owner": "lilyinstarlight",
        "repo": "nixos-cosmic",
        "rev": "a364e6a5e9eb93253daf93c747b150e31e09b13c",
        "type": "github"
      },
      "original": {
        "owner": "lilyinstarlight",
        "repo": "nixos-cosmic",
        "type": "github"
      }
    },
    "crane": {
      "locked": {
        "lastModified": 1730652660,
        "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=",
        "owner": "ipetkov",
        "repo": "crane",
        "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458",
        "type": "github"
      },
      "original": {
        "owner": "ipetkov",
        "repo": "crane",
        "type": "github"
      }
    },
    "disko": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1734343412,
        "narHash": "sha256-b7G8oFp0Nj01BYUJ6ENC9Qf/HsYAIZvN9k/p0Kg/PFU=",
        "owner": "nix-community",
        "repo": "disko",
        "rev": "a08bfe06b39e94eec98dd089a2c1b18af01fef19",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "disko",
        "type": "github"
      }
    },
    "fenix": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "nixpkgs"
        ],
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
        "lastModified": 1732689334,
        "narHash": "sha256-yKI1KiZ0+bvDvfPTQ1ZT3oP/nIu3jPYm4dnbRd6hYg4=",
        "owner": "nix-community",
        "repo": "fenix",
        "rev": "a8a983027ca02b363dfc82fbe3f7d9548a8d3dce",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "ref": "monthly",
        "repo": "fenix",
        "type": "github"
      }
    },
    "flake-compat": {
      "flake": false,
      "locked": {
        "lastModified": 1717312683,
        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
        "owner": "nix-community",
        "repo": "flake-compat",
        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "flake-compat",
        "type": "github"
      }
    },
    "flake-compat_2": {
      "flake": false,
      "locked": {
        "lastModified": 1696426674,
        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
        "owner": "edolstra",
        "repo": "flake-compat",
        "type": "github"
      }
    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
          "ollama",
          "lanzaboote",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1730504689,
        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
        "type": "github"
      },
      "original": {
        "owner": "hercules-ci",
        "repo": "flake-parts",
        "type": "github"
      }
    },
    "flake-parts_2": {
      "inputs": {
        "nixpkgs-lib": [
          "ollama",
          "nur",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1733312601,
        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
        "type": "github"
      },
      "original": {
        "owner": "hercules-ci",
        "repo": "flake-parts",
        "type": "github"
      }
    },
    "flake-schemas": {
      "locked": {
        "lastModified": 1721999734,
        "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=",
        "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982",
        "revCount": 75,
        "type": "tarball",
        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz"
      },
      "original": {
        "type": "tarball",
        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
      }
    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
      },
      "locked": {
        "lastModified": 1689068808,
        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "flake-utils",
        "type": "github"
      }
    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "lanzaboote",
          "pre-commit-hooks-nix",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1709087332,
        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
        "owner": "hercules-ci",
        "repo": "gitignore.nix",
        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
        "type": "github"
      },
      "original": {
        "owner": "hercules-ci",
        "repo": "gitignore.nix",
        "type": "github"
      }
    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "chaotic",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1734093295,
+        "lastModified": 1742957044,
-        "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
+        "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
+        "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f",
        "type": "github"
      },
      "original": {
@@ -300,129 +20,49 @@
        "type": "github"
      }
    },
-    "home-manager_2": {
+    "nixlib": {
      "locked": {
        "lastModified": 1736643958,
        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
        "type": "github"
      }
    },
    "nixos-generators": {
      "inputs": {
        "nixlib": "nixlib",
        "nixpkgs": [
          "ollama",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1734344598,
+        "lastModified": 1742568034,
-        "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
+        "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
        "owner": "nix-community",
-        "repo": "home-manager",
+        "repo": "nixos-generators",
-        "rev": "83ecd50915a09dca928971139d3a102377a8d242",
+        "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "repo": "home-manager",
+        "repo": "nixos-generators",
        "type": "github"
      }
    },
    "jovian": {
      "inputs": {
        "nix-github-actions": "nix-github-actions",
        "nixpkgs": [
          "ollama",
          "chaotic",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1734162608,
        "narHash": "sha256-m2AX+3eiVqIK6uO7GbGY7SFnkkYOlR5fQiNI0eRvWOQ=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
        "rev": "31bdf4c7c91204d65afbde01146deee0259a8fb7",
        "type": "github"
      },
      "original": {
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
        "type": "github"
      }
    },
    "lanzaboote": {
      "inputs": {
        "crane": "crane",
        "flake-compat": "flake-compat_2",
        "flake-parts": "flake-parts",
        "nixpkgs": [
          "ollama",
          "nixpkgs"
        ],
        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
        "lastModified": 1731941836,
        "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=",
        "owner": "nix-community",
        "repo": "lanzaboote",
        "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "lanzaboote",
        "type": "github"
      }
    },
    "naersk": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "classified",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1690373729,
        "narHash": "sha256-e136hTT7LqQ2QjOTZQMW+jnsevWwBpMj78u6FRUsH9I=",
        "owner": "nix-community",
        "repo": "naersk",
        "rev": "d9a33d69a9c421d64c8d925428864e93be895dcc",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "naersk",
        "type": "github"
      }
    },
    "nix-github-actions": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "chaotic",
          "jovian",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1729697500,
        "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
        "owner": "zhaofengli",
        "repo": "nix-github-actions",
        "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
        "type": "github"
      },
      "original": {
        "owner": "zhaofengli",
        "ref": "matrix-name",
        "repo": "nix-github-actions",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1734424634,
+        "lastModified": 1742669843,
-        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
        "type": "github"
      },
      "original": {
@@ -432,499 +72,35 @@
        "type": "github"
      }
    },
-    "nixpkgs-stable": {
+    "plasma-manager": {
      "locked": {
        "lastModified": 1734083684,
        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "nixos-24.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-stable_2": {
      "locked": {
        "lastModified": 1720386169,
        "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
        "lastModified": 1734119587,
        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_3": {
      "locked": {
        "lastModified": 1734119587,
        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_4": {
      "locked": {
        "lastModified": 1734119587,
        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
        "owner": "nixos",
        "repo": "nixpkgs",
        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_5": {
      "locked": {
        "lastModified": 1719075281,
        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
        "path": "/nix/store/yqy82fn77fy3rv7lpwa9m11w3a2nnqg5-source",
        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
        "type": "path"
      },
      "original": {
        "id": "nixpkgs",
        "type": "indirect"
      }
    },
    "nu-env": {
      "inputs": {
-        "nixpkgs": [
+        "home-manager": [
-          "ollama",
+          "home-manager"
          "nixpkgs"
        ],
-        "utils": "utils_2"
+        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1732120401,
+        "lastModified": 1742765550,
-        "narHash": "sha256-LR9s2AadmOr+GTX/BYgbYlUZngYMs8Tc9aEMr+TgJRo=",
+        "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=",
        "owner": "MordragT",
        "repo": "nu-env",
        "rev": "127d6f7b03bf7c8c6a520e91e04cab1d9418d1f3",
        "type": "github"
      },
      "original": {
        "owner": "MordragT",
        "repo": "nu-env",
        "type": "github"
      }
    },
    "nur": {
      "inputs": {
        "flake-parts": "flake-parts_2",
        "nixpkgs": "nixpkgs_4",
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
        "lastModified": 1734436142,
        "narHash": "sha256-OUtTLX7FkC/FWd4UzpKUCtBzTKlxz2Yf1bBBHKesu2o=",
        "owner": "nix-community",
-        "repo": "NUR",
+        "repo": "plasma-manager",
-        "rev": "43fccb728c9fa1db8b3abe1817ebdb016593c92c",
+        "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "repo": "NUR",
+        "repo": "plasma-manager",
        "type": "github"
      }
    },
    "ollama": {
      "inputs": {
        "chaotic": "chaotic",
        "classified": "classified",
        "comoji": "comoji",
        "cosmic": "cosmic",
        "disko": "disko",
        "fenix": "fenix",
        "home-manager": "home-manager_2",
        "lanzaboote": "lanzaboote",
        "nixpkgs": [
          "nixpkgs"
        ],
        "nu-env": "nu-env",
        "nur": "nur",
        "private": "private",
        "templates": "templates",
        "valhali": "valhali"
      },
      "locked": {
        "lastModified": 1734730708,
        "narHash": "sha256-BVJyZ7vTNwHwo59XWMlV6+wb5zVdDvSncq/OqzmKUWM=",
        "owner": "MordragT",
        "repo": "nixos",
        "rev": "25ea62f80640868328096edcf43514e95784ad93",
        "type": "github"
      },
      "original": {
        "owner": "MordragT",
        "repo": "nixos",
        "type": "github"
      }
    },
    "pre-commit-hooks-nix": {
      "inputs": {
        "flake-compat": [
          "ollama",
          "lanzaboote",
          "flake-compat"
        ],
        "gitignore": "gitignore",
        "nixpkgs": [
          "ollama",
          "lanzaboote",
          "nixpkgs"
        ],
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
        "lastModified": 1730302582,
        "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
        "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
        "type": "github"
      },
      "original": {
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
        "type": "github"
      }
    },
    "private": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "nixpkgs"
        ],
        "utils": "utils_3"
      },
      "locked": {
        "lastModified": 1732899298,
        "narHash": "sha256-em2pZBl4s/7nR0LONO//A2Uez6D4XS2ZTTUaEh8Hx+g=",
        "ref": "refs/heads/master",
        "rev": "de876d6af27681f96872e5537c31aa04918e4e07",
        "revCount": 2,
        "type": "git",
        "url": "ssh://git@github.com/MordragT/nix-private"
      },
      "original": {
        "type": "git",
        "url": "ssh://git@github.com/MordragT/nix-private"
      }
    },
    "root": {
      "inputs": {
        "home-manager": "home-manager",
        "nixos-generators": "nixos-generators",
        "nixpkgs": "nixpkgs",
-        "ollama": "ollama"
+        "plasma-manager": "plasma-manager"
      }
    },
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
        "lastModified": 1732633904,
        "narHash": "sha256-7VKcoLug9nbAN2txqVksWHHJplqK9Ou8dXjIZAIYSGc=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
        "rev": "8d5e91c94f80c257ce6dbdfba7bd63a5e8a03fa6",
        "type": "github"
      },
      "original": {
        "owner": "rust-lang",
        "ref": "nightly",
        "repo": "rust-analyzer",
        "type": "github"
      }
    },
    "rust-overlay": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "cosmic",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1734316514,
        "narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=",
        "owner": "oxalica",
        "repo": "rust-overlay",
        "rev": "83ee8ff74d6294a7657320f16814754c4594127b",
        "type": "github"
      },
      "original": {
        "owner": "oxalica",
        "repo": "rust-overlay",
        "type": "github"
      }
    },
    "rust-overlay_2": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "lanzaboote",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1730601085,
        "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=",
        "owner": "oxalica",
        "repo": "rust-overlay",
        "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825",
        "type": "github"
      },
      "original": {
        "owner": "oxalica",
        "repo": "rust-overlay",
        "type": "github"
      }
    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
        "owner": "nix-systems",
        "repo": "default",
        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
        "repo": "default",
        "type": "github"
      }
    },
    "systems_2": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
        "owner": "nix-systems",
        "repo": "default",
        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
        "repo": "default",
        "type": "github"
      }
    },
    "systems_3": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
        "owner": "nix-systems",
        "repo": "default",
        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
        "repo": "default",
        "type": "github"
      }
    },
    "systems_4": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
        "owner": "nix-systems",
        "repo": "default",
        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
        "repo": "default",
        "type": "github"
      }
    },
    "systems_5": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
        "owner": "nix-systems",
        "repo": "default",
        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
        "repo": "default",
        "type": "github"
      }
    },
    "templates": {
      "inputs": {
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
        "lastModified": 1723643892,
        "narHash": "sha256-rYugsNYp7HEyokkbTgWbCQThDVYZlBQPAsYrOK8oviY=",
        "owner": "MordragT",
        "repo": "nix-templates",
        "rev": "d76508355a84e3ff08e63536a5c1a4c69bf8fc54",
        "type": "github"
      },
      "original": {
        "owner": "MordragT",
        "repo": "nix-templates",
        "type": "github"
      }
    },
    "treefmt-nix": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "nur",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1733222881,
        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
        "owner": "numtide",
        "repo": "treefmt-nix",
        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "treefmt-nix",
        "type": "github"
      }
    },
    "utils": {
      "inputs": {
        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1710146030,
        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "flake-utils",
        "type": "github"
      }
    },
    "utils_2": {
      "inputs": {
        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1731533236,
        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "flake-utils",
        "type": "github"
      }
    },
    "utils_3": {
      "inputs": {
        "systems": "systems_4"
      },
      "locked": {
        "lastModified": 1731533236,
        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "flake-utils",
        "type": "github"
      }
    },
    "utils_4": {
      "inputs": {
        "systems": "systems_5"
      },
      "locked": {
        "lastModified": 1710146030,
        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "flake-utils",
        "type": "github"
      }
    },
    "valhali": {
      "inputs": {
        "nixpkgs": [
          "ollama",
          "nixpkgs"
        ],
        "utils": "utils_4"
      },
      "locked": {
        "lastModified": 1715600838,
        "narHash": "sha256-90CSxeJanYqCYpi0OYKnrSmrppjM+1byV7VpP9CuEzY=",
        "owner": "MordragT",
        "repo": "valhali",
        "rev": "8b290bfc5d6e0c93f56708467dac31cb4fa7945f",
        "type": "github"
      },
      "original": {
        "owner": "MordragT",
        "repo": "valhali",
        "type": "github"
      }
    }
  },
--- a/flake.nix
+++ b/flake.nix
@@ -1,4 +1,3 @@
 # /etc/nixos/flake.nix
 {
  description = "flake for Yura-PC";
@@ -6,31 +5,70 @@
    nixpkgs = {
      url = "github:NixOS/nixpkgs/nixos-unstable";
    };
-    ollama = {
+    home-manager = {
-      url = "github:MordragT/nixos";
+      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    plasma-manager = {
      url = "github:nix-community/plasma-manager";
      inputs.nixpkgs.follows = "nixpkgs";
      inputs.home-manager.follows = "home-manager";
    };
    nixos-generators = {
      url = "github:nix-community/nixos-generators";
      inputs.nixpkgs.follows = "nixpkgs";
    };
  };
-  outputs = { self, nixpkgs, ollama, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators }: {
    let
      system = "x86_64-linux";
      pkgs = import nixpkgs {
        inherit system;
        config.allowUnfree = true;
        overlays = [ ollama.overlays.default ];
      };
    in
    {
    nixosConfigurations = {
      Yura-PC = nixpkgs.lib.nixosSystem {
        system = "x86_64-linux";
        modules = [
-          ./configuration.nix
+          ./modules
          ./hosts/common.nix
          ./hosts/Yura-PC
          # https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
          home-manager.nixosModules.home-manager
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
            home-manager.users.cazzzer = import ./home;
            # Optionally, use home-manager.extraSpecialArgs to pass
            # arguments to home.nix
          }
        ];
-        specialArgs = {
+      };
-          inherit pkgs;
+      VM = nixpkgs.lib.nixosSystem {
-        };
+        system = "x86_64-linux";
        modules = [
          ./modules
          ./hosts/common.nix
          ./hosts/vm
        ];
      };
      router = nixpkgs.lib.nixosSystem {
        system = "x86_64-linux";
        modules = [
          ./modules
          ./hosts/common.nix
          ./hosts/router
        ];
      };
    };
    # https://github.com/nix-community/nixos-generators?tab=readme-ov-file#using-in-a-flake
    packages.x86_64-linux = {
      proxmox = nixos-generators.nixosGenerate {
        system = "x86_64-linux";
        modules = [
          ./modules
          ./hosts/common.nix
          ./hosts/vm/proxmox.nix
          ./hosts/vm
        ];
        format = "proxmox";
      };
    };
  };
--- a/home/default.nix
+++ b/home/default.nix
@@ -0,0 +1,241 @@
 { config, lib, pkgs, ... }:
 let
  defaultFont = {
    family = "Noto Sans";
    pointSize = 14;
  };
 in
 {
  # Home Manager needs a bit of information about you and the paths it should
  # manage.
  home.username = "cazzzer";
  home.homeDirectory = "/home/cazzzer";
  # Let Home Manager install and manage itself.
  programs.home-manager.enable = true;
  home.sessionVariables = {
    EDITOR = "micro";
    SHELL = "fish";
  };
  services.gnome-keyring = {
    enable = true;
    components = [ "pkcs11" "ssh" ];
  };
  services.darkman = {
    enable = true;
    settings = {
      lat = 37.3387;
      lng = -121.8853;
    };
    lightModeScripts = {
      plasma-color = "plasma-apply-colorscheme BreezeLight";
    };
    darkModeScripts = {
      plasma-color = "plasma-apply-colorscheme BreezeDark";
    };
  };
  programs.fish = {
    enable = true;
    shellInit = "set fish_greeting";
    shellAliases = {
      # Replace ls with exa
      ls = "exa -al --color=always --group-directories-first --icons"; # preferred listing
      la = "exa -a --color=always --group-directories-first --icons";  # all files and dirs
      ll = "exa -l --color=always --group-directories-first --icons";  # long format
      lt = "exa -aT --color=always --group-directories-first --icons"; # tree listing
      "l." = "exa -a | rg '^\.'";                                      # show only dotfiles
      # Replace cat with bat
      cat = "bat";
    };
    # alias for nix shell with flake packages
    functions.add.body = ''
      set -x packages 'nixpkgs#'$argv
      nix shell $packages
    '';
    interactiveShellInit = ''
      fastfetch
    '';
  };
  programs.starship = {
    enable = true;
    enableFishIntegration = true;
    settings = {
      format = lib.concatStrings [
        "$all"
        "$time"
        "$cmd_duration"
        "$line_break"
        "$jobs"
        "$status"
        "$character"
      ];
      username = {
        format = " [╭─$user]($style)@";
        style_user = "bold red";
        style_root = "bold red";
        show_always = true;
      };
      hostname = {
        format = "[$hostname]($style) in ";
        style = "bold dimmed red";
        ssh_only = false;
      };
      directory = {
        style = "purple";
        truncation_length = 0;
        truncate_to_repo = true;
        truncation_symbol = "repo: ";
      };
      git_status = {
        style = "white";
        ahead = "⇡\${count}";
        diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
        behind = "⇣\${count}";
        deleted = "x";
      };
      cmd_duration = {
        min_time = 1000;
        format = "took [$duration]($style) ";
      };
      time = {
        format = " 🕙 $time($style) ";
        time_format = "%T";
        style = "bright-white";
        disabled = false;
      };
      character = {
        success_symbol = " [╰─λ](bold red)";
        error_symbol = " [×](bold red)";
      };
      status = {
        symbol = "🔴";
        format = "[\\[$symbol$status_common_meaning$status_signal_name$status_maybe_int\\]]($style)";
        map_symbol = true;
        disabled = false;
      };
    };
  };
  programs.plasma = {
    enable = true;
    overrideConfig = true;
    workspace.iconTheme = "Tela-circle";
    fonts = {
      general = defaultFont;
      fixedWidth = defaultFont // { family = "Hack"; };
      small = defaultFont // { pointSize = defaultFont.pointSize - 2; };
      toolbar = defaultFont;
      menu = defaultFont;
      windowTitle = defaultFont;
    };
    input.keyboard.layouts = [
      { layout = "us"; displayName = "us"; }
      { layout = "minimak-4"; displayName = "us4"; }
      { layout = "ru"; displayName = "ru"; }
    ];
    kwin.virtualDesktops.number = 2;
    session.sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession";
    shortcuts = {
      # kmix.mic_mute = "ScrollLock";
      kmix.mic_mute = ["Microphone Mute" "ScrollLock" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
      plasmashell.show-barcode = "Meta+M";
      kwin."Window Maximize" = [ "Meta+F" "Meta+PgUp,Maximize Window" ];
      "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Space";
    };
    hotkeys.commands."launch-konsole" = {
      name = "Launch Konsole";
      key = "Meta+Alt+C";
      command = "konsole";
    };
    configFile = {
      kdeglobals.KDE.AnimationDurationFactor = 0.5;
      kdeglobals.General.accentColorFromWallpaper = true;
      kwinrc.Wayland.InputMethod = {
        value = "org.fcitx.Fcitx5.desktop";
        shellExpand = true;
      };
      dolphinrc.General.ShowFullPath = true;
      kactivitymanagerdrc = {
        activities."809dc779-bf5b-49e6-8e3f-cbe283cb05b6" = "Default";
        activities."b34a506d-ac4f-4797-8c08-6ef45bc49341" = "Fun";
        activities-icons."809dc779-bf5b-49e6-8e3f-cbe283cb05b6" = "keyboard";
        activities-icons."b34a506d-ac4f-4797-8c08-6ef45bc49341" = "preferences-desktop-gaming";
      };
    };
  };
  xdg.configFile = {
    "fcitx5/conf/wayland.conf".text = "Allow Overriding System XKB Settings=False";
  };
  # This value determines the Home Manager release that your configuration is
  # compatible with. This helps avoid breakage when a new Home Manager release
  # introduces backwards incompatible changes.
  #
  # You should not change this value, even if you update Home Manager. If you do
  # want to update the value, then make sure to first check the Home Manager
  # release notes.
  home.stateVersion = "24.11"; # Please read the comment before changing.
  # The home.packages option allows you to install Nix packages into your
  # environment.
  # home.packages = [
    # # Adds the 'hello' command to your environment. It prints a friendly
    # # "Hello, world!" when run.
    # pkgs.hello
    # # It is sometimes useful to fine-tune packages, for example, by applying
    # # overrides. You can do that directly here, just don't forget the
    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
    # # fonts?
    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
    # # You can also create simple shell scripts directly inside your
    # # configuration. For example, this adds a command 'my-hello' to your
    # # environment:
    # (pkgs.writeShellScriptBin "my-hello" ''
    #   echo "Hello, ${config.home.username}!"
    # '')
  # ];
  # Home Manager is pretty good at managing dotfiles. The primary way to manage
  # plain files is through 'home.file'.
  # home.file = {
    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
    # # symlink to the Nix store copy.
    # ".screenrc".source = dotfiles/screenrc;
    # # You can also set the file content immediately.
    # ".gradle/gradle.properties".text = ''
    #   org.gradle.console=verbose
    #   org.gradle.daemon.idletimeout=3600000
    # '';
  # };
  # Home Manager can also manage your environment variables through
  # 'home.sessionVariables'. These will be explicitly sourced when using a
  # shell provided by Home Manager. If you don't want to manage your shell
  # through Home Manager then you have to manually source 'hm-session-vars.sh'
  # located at either
  #
  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
  #
  # or
  #
  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
  #
  # or
  #
  #  /etc/profiles/per-user/cazzzer/etc/profile.d/hm-session-vars.sh
  #
  # home.sessionVariables = {
    # EDITOR = "emacs";
  # };
 }
--- a/hosts/Yura-PC/default.nix
+++ b/hosts/Yura-PC/default.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{ lib, config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
  imports =
@@ -10,17 +10,7 @@
      ./hardware-configuration.nix
      # <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
    ];
-
+  mods.kb-input.enable = true;
  services.ollama = {
    enable = true;
    package = pkgs.ollama-sycl;
    environmentVariables = {
      OLLAMA_INTEL_GPU = "1";
      OLLAMA_DEBUG="1";
    };
    loadModels = [];
  };
  systemd.services.ollama.serviceConfig.MemoryDenyWriteExecute = lib.mkForce false;
  # Bootloader.
  boot.loader.systemd-boot.enable = true;
@@ -33,34 +23,16 @@
    "sysrq_always_enabled=1"
  ];
  # https://nixos.wiki/wiki/OSX-KVM
  boot.extraModprobeConfig = ''
    options kvm_amd nested=1
    options kvm_amd emulate_invalid_guest_state=0
    options kvm ignore_msrs=1
  '';
  boot.loader.timeout = 3;
  boot.loader.systemd-boot.configurationLimit = 5;
-
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
  # boot.kernelPackages = pkgs.linuxKernel.kernels.linux_6_8;
  # boot.kernelPackages = pkgs.linuxPackages_6_8;
  # boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_6;
  boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
  # nix-prefetch-git --url https://github.com/zen-kernel/zen-kernel.git --rev v6.8.9-zen1 --fetch-submodules
  # boot.kernelPackages = let
  #   version = "6.8.9";
  #   suffix = "zen1"; # use "lqx1" for linux_lqx
  # in pkgs.linuxKernel.packagesFor (pkgs.linux_zen.override {
  #   inherit version suffix;
  #   modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
  #   src = pkgs.fetchFromGitHub {
  #     owner = "zen-kernel";
  #     repo = "zen-kernel";
  #     rev = "v${version}-${suffix}";
  #     sha256 = "1wva92wk0pxii4f6hn27kssgrz8yy38kk38w2wm5hh1qyz3ij1vj";
  #   };
  # });
  boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ];
  # https://discourse.nixos.org/t/dev-zfs-has-the-wrong-permissions-after-rebooting/48737
  # environment.etc."tmpfiles.d/zfs.conf".text = ''
  # z /dev/zfs          0666 - -     -
  # '';
  # https://nixos.wiki/wiki/Accelerated_Video_Playback
  hardware.graphics = {
@@ -69,7 +41,8 @@
      intel-media-driver # LIBVA_DRIVER_NAME=iHD
    ];
  };
-  # environment.sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; # Force intel-media-driver
+
  environment.etc.hosts.mode = "0644";
  networking.hostName = "Yura-PC"; # Define your hostname.
  networking.hostId = "110a2814"; # Required for ZFS.
@@ -82,24 +55,6 @@
  # Enable networking
  networking.networkmanager.enable = true;
  # Set your time zone.
  time.timeZone = "America/Los_Angeles";
  # Select internationalisation properties.
  i18n.defaultLocale = "en_US.UTF-8";
  i18n.extraLocaleSettings = {
    LC_ADDRESS = "en_US.UTF-8";
    LC_IDENTIFICATION = "en_US.UTF-8";
    LC_MEASUREMENT = "en_US.UTF-8";
    LC_MONETARY = "en_US.UTF-8";
    LC_NAME = "en_US.UTF-8";
    LC_NUMERIC = "en_US.UTF-8";
    LC_PAPER = "en_US.UTF-8";
    LC_TELEPHONE = "en_US.UTF-8";
    LC_TIME = "en_US.UTF-8";
  };
  # Enable the X11 windowing system.
  # You can disable this if you're only using the Wayland session.
  services.xserver.enable = false;
@@ -109,17 +64,11 @@
  services.displayManager.sddm.wayland.enable = true;
  services.desktopManager.plasma6.enable = true;
  # Configure keymap in X11
  services.xserver.xkb = {
    layout = "us";
    variant = "";
  };
  # Enable CUPS to print documents.
  services.printing.enable = true;
  # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
  security.rtkit.enable = true;
  services.pipewire = {
    enable = true;
@@ -136,7 +85,7 @@
  # services.qemuGuest.enable = true;
  # services.spice-vdagentd.enable = true;
-  services.sshd.enable = true;
+  services.openssh.enable = true;
  services.flatpak.enable = true;
  # services.geoclue2.enable = true;
  location.provider = "geoclue2";
@@ -144,37 +93,6 @@
  security.pam.services.sddm.enableGnomeKeyring = true;
  # security.pam.services.sddm.gnupg.enable = true;
  services.xserver.xkb.extraLayouts = {
    minimak-4 = {
      description = "English (US, Minimak-4)";
      languages = [ "eng" ];
      # symbolsFile = /etc/nixos/minimak;
      symbolsFile = ./minimak;
    };
    minimak-8 = {
      description = "English (US, Minimak-8)";
      languages = [ "eng" ];
      # symbolsFile = /etc/nixos/minimak;
      symbolsFile = ./minimak;
    };
    minimak-12 = {
      description = "English (US, Minimak-12)";
      languages = [ "eng" ];
      # symbolsFile = /etc/nixos/minimak;
      symbolsFile = ./minimak;
    };
  };
  i18n.inputMethod = {
    type = "fcitx5";
    enable = true;
    fcitx5.waylandFrontend = true;
    fcitx5.plasma6Support = true;
    fcitx5.addons = with pkgs; [
      fcitx5-mozc
    ];
 };
  # Enable touchpad support (enabled default in most desktopManager).
  # services.xserver.libinput.enable = true;
@@ -192,10 +110,7 @@
    group = "cazzzer";
    extraGroups = [ "networkmanager" "wheel" "docker" "wireshark" "geoclue" ];
    packages = with pkgs; [
-      python312Packages.torch
+      # Python
      kdePackages.kate
      kdePackages.yakuake
      python3
      poetry
@@ -208,23 +123,23 @@
      pnpm
      bun
-      # yin_yang deps, f*** this packaging s***
+      # Nix
-      python312Packages.systemd
+      nixd
-      python312Packages.pyside6
+
-      python312Packages.dateutils
+      # Gleam
-      python312Packages.psutil
+      gleam
-      libnotify
+      beamMinimal26Packages.erlang
      # thunderbird
    ];
  };
  hardware.bluetooth.enable = true;
  hardware.bluetooth.powerOnBoot = false;
  # Install firefox.
-  programs.firefox.enable = true;
+  # programs.firefox.enable = true;
  programs.kdeconnect.enable = true;
  programs.fish.enable = true;
  programs.git.enable = true;
  programs.git.lfs.enable = true;
  # https://nixos.wiki/wiki/Git
  programs.git.package = pkgs.git.override { withLibsecret = true; };
  programs.lazygit.enable = true;
@@ -233,13 +148,14 @@
  programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
  # programs.starship.enable = true;
  programs.wireshark.enable = true;
  programs.wireshark.package = pkgs.wireshark; # wireshark-cli by default
  programs.bat.enable = true;
  programs.htop.enable = true;
  # https://nixos.wiki/wiki/Docker
  virtualisation.docker.enable = true;
  virtualisation.docker.enableOnBoot = false;
  virtualisation.docker.package = pkgs.docker_27;
  virtualisation.docker.storageDriver = "zfs";
  # https://discourse.nixos.org/t/firefox-does-not-use-kde-window-decorations-and-cursor/32132/3
  # programs.dconf.enable = true;
@@ -267,106 +183,86 @@
    # For JetBrains stuff
    # https://github.com/NixOS/nixpkgs/issues/240444
    curl
    expat
    fontconfig
    freetype
    fuse
    fuse3
    glib
    icu
    libclang.lib
    libdbusmenu
    libsecret
    libxcrypt-legacy
    libxml2
    nss
    openssl
    python3
    stdenv.cc.cc
    xorg.libX11
    xorg.libXcursor
    xorg.libXext
    xorg.libXi
    xorg.libXrender
    xorg.libXtst
    xz
    zlib
  ];
-  # attempt to fix flatpak firefox cjk fonts 
+  # attempt to fix flatpak firefox cjk fonts
  # fonts.fontconfig.defaultFonts.serif = [
  #   "Noto Serif"
  #   "DejaVu Serif"
  # ];
  # fonts.fontconfig.defaultFonts.sansSerif = [
  #   "Noto Sans"
  #   "DejaVu Sans"
  # ];
  workarounds.flatpak.enable = true;
  fonts.packages = with pkgs; [
    fantasque-sans-mono
    nerd-fonts.fantasque-sans-mono
    noto-fonts
    noto-fonts-emoji
    noto-fonts-cjk-sans
    noto-fonts-cjk-serif
    jetbrains-mono
   ];
  # fonts.fontDir.enable = true;
  # fonts.fontconfig.allowBitmaps = false;
  environment.systemPackages = with pkgs; [
    level-zero
    oneDNN
    python312Packages.torch
    # zfs
    # fish
    bat
    # bluez
 #     docker_27
 #     docker-compose
    dust
    efibootmgr
    eza
    fastfetch
    fd
    # flatpak
    kdePackages.flatpak-kcm
    kdePackages.filelight
    # git
    gcr
    gnome-keyring # config for this and some others
    gnumake
    helix
    htop
    jetbrains-toolbox # or maybe do invidual ones?
    # jetbrains.rust-rover
    # jetbrains.pycharm-professional
    # jetbrains.webstorm
    mediainfo
    micro
    mpv
    neofetch
    # neovim
    nextcloud-client
    noto-fonts-cjk-sans
    noto-fonts-cjk-serif
    lxqt.pavucontrol-qt
    pinentry
    rbw
    ripgrep
    rustup
    starship
    tealdeer
  ] ++ [
    efibootmgr
    ffmpeg
    file
    fq
    gnumake
    ijq
    jq
    ldns
    mediainfo
    rbw
    restic
    resticprofile
    rclone
    ripgrep-all
    rustscan
    whois
    yt-dlp
  ] ++ [
    darkman
    host-spawn # for flatpaks
    kdePackages.filelight
    kdePackages.flatpak-kcm
    kdePackages.kate
    kdePackages.yakuake
    gcr
    gnome-keyring # config for this and some others
    mpv
    nextcloud-client
    lxqt.pavucontrol-qt
    pinentry
    tela-circle-icon-theme
    fantasque-sans-mono
    jetbrains-mono
    virt-viewer
    waypipe
-    whois
+  ] ++ [
-    # wireshark
+    # jetbrains.rust-rover
-    yt-dlp
+    # jetbrains.goland
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    jetbrains.clion
-  #  wget
+    jetbrains.idea-ultimate
    jetbrains.pycharm-professional
    jetbrains.webstorm
    android-studio
    rustup
  ];
  # nix.package = pkgs.nixFlakes;
  nix.settings.experimental-features = [ "nix-command" "flakes" ];
  environment.etc."current-system-packages".text =
    let
      packages = builtins.map (p: "${p.name}") config.environment.systemPackages;
      sortedUnique = builtins.sort builtins.lessThan (pkgs.lib.lists.unique packages);
      formatted = builtins.concatStringsSep "\n" sortedUnique;
    in
      formatted;
  # Some programs need SUID wrappers, can be configured further or are
  # started in user sessions.
  # programs.mtr.enable = true;
@@ -381,8 +277,9 @@
  # services.openssh.enable = true;
  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.nftables.enable = true;
-  # networking.firewall.allowedUDPPorts = [ ... ];
+  networking.firewall.allowedTCPPorts = [ 8080 22000 ];
  networking.firewall.allowedUDPPorts = [ 22000 ];
  # Or disable the firewall altogether.
  # networking.firewall.enable = false;
--- a/hosts/Yura-PC/hardware-configuration.nix
+++ b/hosts/Yura-PC/hardware-configuration.nix
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -0,0 +1,31 @@
 { config, pkgs, ... }: {
  # Allow unfree packages
  nixpkgs.config.allowUnfree = true;
  # Set your time zone.
  time.timeZone = "America/Los_Angeles";
  # Select internationalisation properties.
  i18n.defaultLocale  = "en_US.UTF-8";
  i18n.extraLocaleSettings = {
    LC_ADDRESS        = "en_US.UTF-8";
    LC_IDENTIFICATION = "en_US.UTF-8";
    LC_MEASUREMENT    = "en_US.UTF-8";
    LC_MONETARY       = "en_US.UTF-8";
    LC_NAME           = "en_US.UTF-8";
    LC_NUMERIC        = "en_US.UTF-8";
    LC_PAPER          = "en_US.UTF-8";
    LC_TELEPHONE      = "en_US.UTF-8";
    LC_TIME           = "en_US.UTF-8";
  };
  nix.settings.experimental-features = [ "nix-command" "flakes" ];
  environment.etc."current-system-packages".text =
    let
      packages = builtins.map (p: "${p.name}") config.environment.systemPackages;
      sortedUnique = builtins.sort builtins.lessThan (pkgs.lib.lists.unique packages);
      formatted = builtins.concatStringsSep "\n" sortedUnique;
    in
      formatted;
 }
--- a/hosts/router/default.nix
+++ b/hosts/router/default.nix
@@ -0,0 +1,104 @@
 { config, lib, pkgs, ... }:
 {
  imports =
    [ # Include the results of the hardware scan.
      ./hardware-configuration.nix
      ./ifconfig.nix
      ./firewall.nix
      ./dns.nix
      ./kea.nix
      ./services.nix
    ];
  # Bootloader.
  boot.loader.systemd-boot.enable = true;
  boot.loader.efi.canTouchEfiVariables = false;
  boot.kernelParams = [
    "sysrq_always_enabled=1"
  ];
  boot.loader.timeout = 2;
  boot.loader.systemd-boot.configurationLimit = 5;
  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
  boot.growPartition = true;
  networking.hostName = "grouter";
  # Enable the X11 windowing system.
  # You can disable this if you're only using the Wayland session.
  services.xserver.enable = false;
  # Enable the KDE Plasma Desktop Environment.
  # Useful for debugging with wireshark.
  # services.displayManager.sddm.enable = true;
  hardware.graphics.enable = true;
  services.displayManager.sddm.wayland.enable = true;
  services.desktopManager.plasma6.enable = true;
  # No need for audio in VM
  services.pipewire.enable = false;
  # VM services
  services.qemuGuest.enable = true;
  services.spice-vdagentd.enable = true;
  services.openssh.enable = true;
  services.openssh.settings.PasswordAuthentication = false;
  services.openssh.settings.KbdInteractiveAuthentication = false;
  security.sudo.wheelNeedsPassword = false;
  users.groups = {
    cazzzer = {
      gid = 1000;
    };
  };
  users.users.cazzzer = {
    password = "";
    openssh.authorizedKeys.keys = [
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPWgEzbEjbbu96MVQzkiuCrw+UGYAXN4sRe2zM6FVopq cazzzer@Yura-PC"
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIApFeLVi3BOquL0Rt+gQK2CutNHaBDQ0m4PcGWf9Bc43 cazzzer@Yura-TPX13"
    ];
    isNormalUser = true;
    description = "Yura";
    uid = 1000;
    group = "cazzzer";
    extraGroups = [ "wheel" "wireshark" ];
  };
  programs.firefox.enable = true;
  programs.fish.enable = true;
  programs.git.enable = true;
  programs.neovim.enable = true;
  programs.bat.enable = true;
  programs.htop.enable = true;
  programs.wireshark.enable = true;
  programs.wireshark.package = pkgs.wireshark; # wireshark-cli by default
  environment.systemPackages = with pkgs; [
    dust
    eza
    fastfetch
    fd
    kdePackages.filelight
    kdePackages.kate
    kdePackages.yakuake
    ldns
    lsof
    micro
    mpv
    ripgrep
    rustscan
    starship
    tealdeer
    waypipe
    whois
  ];
  # This value determines the NixOS release from which the default
  # settings for stateful data, like file locations and database versions
  # on your system were taken. It‘s perfectly fine and recommended to leave
  # this value at the release version of the first install of this system.
  # Before changing this value read the documentation for this option
  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
  system.stateVersion = "24.11"; # Did you read the comment?
 }
--- a/hosts/router/dns.nix
+++ b/hosts/router/dns.nix
@@ -0,0 +1,129 @@
 { config, lib, pkgs, ... }:
 let
  vars = import ./vars.nix;
  domain = vars.domain;
  ldomain = vars.ldomain;
  sysdomain = vars.sysdomain;
  ifs = vars.ifs;
  alpinaDomains = [
    "|"
    "|nc."
    "|sonarr."
    "|radarr."
    "|prowlarr."
    "|qbit."
    "|gitea."
    "|traefik."
    "|auth."
    "||s3."
    "|minio."
    "|jellyfin."
    "|whoami."
    "|grafana."
    "|influxdb."
    "|uptime."
    "|opnsense."
    "|vpgen."
    "|woodpecker."
    "||pgrok."
    "|sync."
  ];
 in
 {
  # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes
  # For upstream quic dns
  boot.kernel.sysctl."net.core.wmem_max" = 7500000;
  boot.kernel.sysctl."net.core.rmem_max" = 7500000;
  services.resolved.enable = false;
  networking.resolvconf.enable = true;
  networking.resolvconf.useLocalResolver = true;
  services.adguardhome.enable = true;
  services.adguardhome.mutableSettings = false;
  services.adguardhome.settings = {
    dns = {
      bootstrap_dns = [ "1.1.1.1" "9.9.9.9" ];
      upstream_dns = [
        # Default upstreams
        "quic://p0.freedns.controld.com"
        "tls://one.one.one.one"
        "tls://dns.quad9.net"
        # Adguard uses upstream and not rewrite rules to resolve cname rewrites,
        # and obviously my sysdomain entries don't exist in cloudflare.
        "[/${sysdomain}/][::1]"           # Sys domains to self (for cname rewrites)
        "[/${ldomain}/][::1]:1053"        # Local domains to Knot (ddns)
        "[/home/][${ifs.lan.ulaPrefix}::250]"  # .home domains to opnsense (temporary)
      ];
    };
    # https://adguard-dns.io/kb/general/dns-filtering-syntax/
    user_rules = [
      # DNS rewrites
      "|grouter.${domain}^$dnsrewrite=${ifs.lan.ulaAddr}"
      "|pve-1.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.5"
      "|pve-1.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::5:1"
      "|pve-3.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.7"
      "|pve-3.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::7:1"
      "|truenas.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.10"
      "|truenas.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::20d0:43ff:fec6:3192"
      "|debbi.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.11"
      "|debbi.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::11:1"
      "|etappi.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.12"
      "|etappi.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::12:1"
      # Lab DNS rewrites
      "||lab.${domain}^$dnsrewrite=etappi.${sysdomain}"
      # Allowed exceptions
      "@@||googleads.g.doubleclick.net"
    ]
      # Alpina DNS rewrites
      ++ map (host: "${host}${domain}^$dnsrewrite=debbi.${sysdomain}") alpinaDomains;
  };
  services.knot.enable = true;
  services.knot.settings = {
    # server.listen = "0.0.0.0@1053";
    server.listen = "::1@1053";
    zone = [
      {
        domain = ldomain;
        storage = "/var/lib/knot/zones";
        file = "${ldomain}.zone";
        acl = [ "allow_localhost_update" ];
      }
    ];
    acl = [
      {
        id = "allow_localhost_update";
        address = [ "::1" "127.0.0.1" ];
        action = [ "update" ];
      }
    ];
  };
  # Ensure the zone file exists
  system.activationScripts.knotZoneFile = ''
    ZONE_DIR="/var/lib/knot/zones"
    ZONE_FILE="$ZONE_DIR/${ldomain}.zone"
    # Create the directory if it doesn't exist
    mkdir -p "$ZONE_DIR"
    # Check if the zone file exists
    if [ ! -f "$ZONE_FILE" ]; then
      # Create the zone file with a basic SOA record
      # Serial; Refresh; Retry; Expire; Negative Cache TTL;
      echo "${ldomain}. 3600 SOA ns.${ldomain}. admin.${ldomain}. 1 86400 900 691200 3600" > "$ZONE_FILE"
      echo "Created new zone file: $ZONE_FILE"
    else
      echo "Zone file already exists: $ZONE_FILE"
    fi
    # Ensure proper ownership and permissions
    chown -R knot:knot "/var/lib/knot"
    chmod 644 "$ZONE_FILE"
  '';
 }
--- a/hosts/router/firewall.nix
+++ b/hosts/router/firewall.nix
@@ -0,0 +1,182 @@
 { config, lib, pkgs, ... }:
 let
  vars = import ./vars.nix;
  links = vars.links;
  ifs = vars.ifs;
  pdFromWan = vars.pdFromWan;
 in
 {
  networking.firewall.enable = false;
  networking.nftables.enable = true;
  networking.nftables.tables.firewall = {
    family = "inet";
    content = ''
      define ZONE_WAN_IFS = { ${ifs.wan.name} }
      define ZONE_LAN_IFS = {
          ${ifs.lan.name},
          ${ifs.lan10.name},
          ${ifs.lan20.name},
          ${ifs.lan30.name},
          ${ifs.lan40.name},
          ${ifs.lan50.name},
      }
      define OPNSENSE_NET6 = ${pdFromWan}d::/64
      define ZONE_LAN_EXTRA_NET6 = {
          ${ifs.lan20.net6},  # needed since packets can come in from wan on these addrs
          $OPNSENSE_NET6,
      }
      define RFC1918 = { 10.0.0.0/8, 172.12.0.0/12, 192.168.0.0/16 }
      define CLOUDFLARE_NET6 = {
          # https://www.cloudflare.com/ips-v6
          # TODO: figure out a better way to get addrs dynamically from url
          2400:cb00::/32,
          2606:4700::/32,
          2803:f800::/32,
          2405:b500::/32,
          2405:8100::/32,
          2a06:98c0::/29,
          2c0f:f248::/32,
      }
      define ALLOWED_TCP_PORTS = { ssh, https }
      define ALLOWED_UDP_PORTS = { bootps, dhcpv6-server, domain }
      map port_forward_v4 {
          type inet_proto . inet_service : ipv4_addr . inet_service
          elements = {
              tcp . 8006 : ${ifs.lan50.p4}.10 . 8006
          }
      }
      set port_forward_v6 {
          type inet_proto . ipv6_addr . inet_service
          # elements = {}
      }
      set cloudflare_forward_v6 {
          type ipv6_addr
          elements = {
              ${ifs.lan.p6}::11:1,
          }
      }
      chain input {
          type filter hook input priority filter; policy drop;
          # Drop router adverts from self
          # peculiarity due to wan and lan20 being bridged
          # TODO: figure out a less jank way to do this
          iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} icmpv6 type nd-router-advert log prefix "self radvt: " drop
          # iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} ip6 nexthdr icmpv6 log prefix "self icmpv6: " drop
          # iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} log prefix "self llv6: " drop
          # iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} log drop
          # iifname $ZONE_LAN_IFS ip6 saddr ${links.wanLL} log drop
          # Allow established and related connections
          # All icmp stuff should (theoretically) be handled by ct related
          # https://serverfault.com/a/632363
          ct state established,related accept
          # However, that doesn't happen for router advertisements from what I can tell
          # TODO: more testing
          # Allow ICMPv6 on local addrs
          ip6 nexthdr icmpv6 ip6 saddr { fe80::/10, ${pdFromWan}0::/60 } accept
          ip6 nexthdr icmpv6 ip6 daddr fe80::/10 accept # TODO: not sure if necessary
          # Allow all traffic from loopback interface
          iif lo accept
          # Allow DHCPv6 traffic
          # I thought dhcpv6-client traffic would be accepted by established/related,
          # but apparently not.
          ip6 daddr { fe80::/10, ff02::/16 } th dport { dhcpv6-client, dhcpv6-server } accept
          # WAN zone input rules
          iifname $ZONE_WAN_IFS jump zone_wan_input
          # LAN zone input rules
          iifname $ZONE_LAN_IFS accept
          iifname $ZONE_LAN_IFS jump zone_lan_input
          ip6 saddr $ZONE_LAN_EXTRA_NET6 jump zone_lan_input
          # log
      }
      chain forward {
          type filter hook forward priority filter; policy drop;
          # Allow established and related connections
          ct state established,related accept
          # WAN zone forward rules
          iifname $ZONE_WAN_IFS jump zone_wan_forward
          # LAN zone forward rules
          iifname $ZONE_LAN_IFS jump zone_lan_forward
          ip6 saddr $ZONE_LAN_EXTRA_NET6 jump zone_lan_forward
      }
      chain zone_wan_input {
          # Allow SSH from WAN (if needed)
          tcp dport ssh accept
      }
      chain zone_wan_forward {
          # Port forwarding
          ct status dnat accept
          # Allowed IPv6 ports
          meta l4proto . ip6 daddr . th dport @port_forward_v6 accept
          # Allowed IPv6 from cloudflare
          ip6 saddr $CLOUDFLARE_NET6 ip6 daddr @cloudflare_forward_v6 accept
      }
      chain zone_lan_input {
          # Allow all ICMPv6 from LAN
          ip6 nexthdr icmpv6 accept
          # Allow all ICMP from LAN
          ip protocol icmp accept
          # Allow specific services from LAN
          tcp dport $ALLOWED_TCP_PORTS accept
          udp dport $ALLOWED_UDP_PORTS accept
      }
      chain zone_lan_forward {
          # Allow port forwarded targets
          # ct status dnat accept
          # Allow all traffic from LAN to WAN, except ULAs
          oifname $ZONE_WAN_IFS ip6 saddr fd00::/8 drop  # Not sure if needed
          oifname $ZONE_WAN_IFS accept;
          # Allow traffic between LANs
          oifname $ZONE_LAN_IFS accept
      }
      chain output {
          # Accept anything out of self by default
          type filter hook output priority filter; policy accept;
          # NAT reflection
          # oif lo ip daddr != 127.0.0.0/8 dnat ip to meta l4proto . th dport map @port_forward_v4
      }
      chain prerouting {
          # Initial step, accept by default
          type nat hook prerouting priority dstnat; policy accept;
          # Port forwarding
          fib daddr type local dnat ip to meta l4proto . th dport map @port_forward_v4
      }
      chain postrouting {
          # Last step, accept by default
          type nat hook postrouting priority srcnat; policy accept;
          # Masquerade LAN addrs
          oifname $ZONE_WAN_IFS ip saddr $RFC1918 masquerade
          # Optional IPv6 masquerading (big L if enabled, don't forget to allow forwarding)
          # oifname $ZONE_WAN_IFS ip6 saddr fd00::/8 masquerade
      }
    '';
  };
 }
--- a/hosts/router/hardware-configuration.nix
+++ b/hosts/router/hardware-configuration.nix
@@ -0,0 +1,37 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 {
  imports =
    [ (modulesPath + "/profiles/qemu-guest.nix")
    ];
  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "sr_mod" "virtio_blk" ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ "kvm-intel" ];
  boot.extraModulePackages = [ ];
  fileSystems."/" =
    { device = "/dev/disk/by-uuid/f222513b-ded1-49fa-b591-20ce86a2fe7f";
      fsType = "ext4";
    };
  fileSystems."/boot" =
    { device = "/dev/disk/by-uuid/12CE-A600";
      fsType = "vfat";
      options = [ "fmask=0022" "dmask=0022" ];
    };
  swapDevices = [ ];
  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
  # (the default) this is the recommended approach. When using systemd-networkd it's
  # still possible to use this option, but it's recommended to use it in conjunction
  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
  networking.useDHCP = lib.mkDefault true;
  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
--- a/hosts/router/ifconfig.nix
+++ b/hosts/router/ifconfig.nix
@@ -0,0 +1,180 @@
 { config, lib, pkgs, ... }:
 let
  vars = import ./vars.nix;
  links = vars.links;
  ifs = vars.ifs;
  pdFromWan = vars.pdFromWan;
  ulaPrefix = vars.ulaPrefix;
  mkVlanDev = { id, name }: {
    netdevConfig = {
      Kind = "vlan";
      Name = name;
    };
    vlanConfig.Id = id;
  };
  mkLanConfig = ifObj: {
    matchConfig.Name = ifObj.name;
    networkConfig = {
      IPv4Forwarding = true;
      IPv6SendRA = true;
      Address = [ ifObj.addr4Sized ifObj.addr6Sized ifObj.ulaAddrSized ];
    };
    ipv6Prefixes = [
      {
        Prefix = ifObj.net6;
        Assign = true;
        # Token = [ "static::1" "eui64" ];
        Token = [ "static:${ifObj.ip6Token}" ];
      }
      {
          Prefix = ifObj.ulaNet;
          Assign = true;
          Token = [ "static:${ifObj.ulaToken}" ];
      }
    ];
    ipv6RoutePrefixes = [ { Route = "${ulaPrefix}::/48"; } ];
    ipv6SendRAConfig = {
      # don't manage the att box subnet
      # should work fine either way though
      Managed = (ifObj.p6 != "${pdFromWan}0");
      OtherInformation = (ifObj.p6 != "${pdFromWan}0");
      EmitDNS = true;
      DNS = [ ifObj.ulaAddr ];
    };
  };
 in
 {
  # It is impossible to do multiple prefix requests with networkd,
  # so I use dhcpcd for this
  # https://github.com/systemd/systemd/issues/22571
  # https://github.com/systemd/systemd/issues/22571#issuecomment-2094905496
  # https://gist.github.com/csamsel/0f8cca3b2e64d7e4cc47819ec5ba9396
  networking.dhcpcd.enable = true;
  networking.dhcpcd.allowInterfaces = [ ifs.wan.name ];
  networking.dhcpcd.extraConfig = ''
    debug
    nohook resolv.conf, yp, hostname, ntp
    interface ${ifs.wan.name}
      ipv6only
      duid
      ipv6rs
      dhcp6
      # option rapid_commit
      # DHCPv6 addr
      ia_na
      # DHCPv6 Prefix Delegation
      # request the leases just for routing (so that the att box knows we're here)
      # actual ip assignments are static, based on $pdFromWan
      ia_pd 1/${ifs.lan.net6} -
      ia_pd 10/${ifs.lan10.net6} -
      # ia_pd 20/${pdFromWan}d::/64 -  # for opnsense (legacy services)
      ia_pd 30/${ifs.lan30.net6} -
      ia_pd 40/${ifs.lan40.net6} -
      ia_pd 50/${ifs.lan50.net6} -
      # ia_pd 7 -
      # ia_pd 8 -
      # the leases can be assigned to the interfaces,
      # but this doesn't play well with networkd
      # ia_pd 1 ${ifs.lan.name}/0
      # ia_pd 2 ${ifs.lan10.name}/0
      # ia_pd 3 ${ifs.lan20.name}/0
  '';
  networking.useNetworkd = true;
  systemd.network.enable = true;
  systemd.network = {
    # Global options
    config.networkConfig = {
      IPv4Forwarding = true;
      IPv6Forwarding = true;
    };
    # This is applied by udev, not networkd
    # https://nixos.wiki/wiki/Systemd-networkd
    # https://nixos.org/manual/nixos/stable/#sec-rename-ifs
    links = {
      "10-wan" = {
        matchConfig.PermanentMACAddress = links.wanMAC;
        linkConfig.Name = ifs.wan.name;
      };
      "10-lan" = {
        matchConfig.PermanentMACAddress = links.lanMAC;
        linkConfig.Name = ifs.lan.name;
      };
    };
    netdevs = {
      "10-vlan10" = mkVlanDev { id = 10; name = ifs.lan10.name; };
      "10-vlan20" = mkVlanDev { id = 20; name = ifs.lan20.name; };
      "10-vlan30" = mkVlanDev { id = 30; name = ifs.lan30.name; };
      "10-vlan40" = mkVlanDev { id = 40; name = ifs.lan40.name; };
      "10-vlan50" = mkVlanDev { id = 50; name = ifs.lan50.name; };
    };
    networks = {
      "10-wan" = {
        matchConfig.Name = ifs.wan.name;
        # make routing on this interface a dependency for network-online.target
        linkConfig.RequiredForOnline = "routable";
        networkConfig = {
          # start a DHCP Client for IPv4 Addressing/Routing
          # DHCP = "ipv4";
          # accept Router Advertisements for Stateless IPv6 Autoconfiguraton (SLAAC)
          # let dhcpcd handle this
          Address = [ ifs.wan.addr4Sized ];
          IPv6AcceptRA = false;
          KeepConfiguration = true;
        };
        routes = [
          { Gateway = ifs.wan.gw4; }
        ];
      };
      "20-lan" = (mkLanConfig ifs.lan) // {
        vlan = [
          ifs.lan10.name
          ifs.lan20.name
          ifs.lan30.name
          ifs.lan40.name
          ifs.lan50.name
        ];
      };
      "30-vlan10" = mkLanConfig ifs.lan10;
      "30-vlan20" = mkLanConfig ifs.lan20;
      "30-vlan30" = mkLanConfig ifs.lan30;
      "30-vlan40" = mkLanConfig ifs.lan40;
      "30-vlan50" = mkLanConfig ifs.lan50;
    };
  };
  # For some reason, the interfaces stop receiving route solicitations after a while.
  # Regular router adverts still get sent out at intervals, but this breaks dhcp6 clients.
  # Restarting networkd makes it work again, I have no clue why.
  # This is jank af, but I've tried a bunch of other stuff with no success
  # and I'm giving up (for now).
  systemd.timers."restart-networkd" = {
    wantedBy = [ "timers.target" ];
      timerConfig = {
        OnBootSec = "1m";
        OnUnitActiveSec = "1m";
        Unit = "restart-networkd.service";
      };
  };
  systemd.services."restart-networkd" = {
    script = ''
      set -eu
      ${pkgs.systemd}/bin/systemctl restart systemd-networkd
    '';
    serviceConfig = {
      Type = "oneshot";
      User = "root";
    };
  };
 }
--- a/hosts/router/kea.nix
+++ b/hosts/router/kea.nix
@@ -0,0 +1,183 @@
 { config, lib, pkgs, ... }:
 let
  vars = import ./vars.nix;
  ldomain = vars.ldomain;
  ifs = vars.ifs;
  mkDhcp4Subnet = id: ifObj: {
    id = id;
    subnet = ifObj.net4;
    pools = [ { pool = "${ifObj.p4}.100 - ${ifObj.p4}.199"; } ];
    ddns-qualifying-suffix = "4.${ifObj.domain}";
    option-data = [
      { name = "routers"; data = ifObj.addr4; }
      { name = "domain-name-servers"; data = ifObj.addr4; }
      { name = "domain-name"; data = "4.${ifObj.domain}"; }
    ];
  };
  mkDhcp6Subnet = id: ifObj: {
    id = id;
    interface = ifObj.name;
    subnet = ifObj.net6;
    rapid-commit = true;
    pools = [ { pool = "${ifObj.p6}::1:1000/116"; } ];
    ddns-qualifying-suffix = "6.${ifObj.domain}";
    option-data = [
      { name = "domain-search"; data = "6.${ifObj.domain}"; }
    ];
  };
  # Reservations added to Kea
  reservations.lan.v4.reservations = [
    {
      hw-address = "64:66:b3:78:9c:09";
      hostname = "openwrt";
      ip-address = "${ifs.lan.p4}.2";
    }
    {
      hw-address = "40:86:cb:19:9d:70";
      hostname = "dlink-switchy";
      ip-address = "${ifs.lan.p4}.3";
    }
    {
      hw-address = "6c:cd:d6:af:4f:6f";
      hostname = "netgear-switchy";
      ip-address = "${ifs.lan.p4}.4";
    }
    {
      hw-address = "74:d4:35:1d:0e:80";
      hostname = "pve-1";
      ip-address = "${ifs.lan.p4}.5";
    }
    {
      hw-address = "00:25:90:f3:d0:e0";
      hostname = "pve-2";
      ip-address = "${ifs.lan.p4}.6";
    }
    {
      hw-address = "a8:a1:59:d0:57:87";
      hostname = "pve-3";
      ip-address = "${ifs.lan.p4}.7";
    }
    {
      hw-address = "22:d0:43:c6:31:92";
      hostname = "truenas";
      ip-address = "${ifs.lan.p4}.10";
    }
    {
      hw-address = "1e:d5:56:ec:c7:4a";
      hostname = "debbi";
      ip-address = "${ifs.lan.p4}.11";
    }
    {
      hw-address = "ee:42:75:2e:f1:a6";
      hostname = "etappi";
      ip-address = "${ifs.lan.p4}.12";
    }
  ];
  reservations.lan.v6.reservations = [
    {
      duid = "00:03:00:01:64:66:b3:78:9c:09";
      hostname = "openwrt";
      ip-addresses = [ "${ifs.lan.p6}::1:2" ];
    }
    {
      duid = "00:01:00:01:2e:c0:63:23:22:d0:43:c6:31:92";
      hostname = "truenas";
      ip-addresses = [ "${ifs.lan.p6}::10:1" ];
    }
    {
      duid = "00:02:00:00:ab:11:09:41:25:21:32:71:e3:77";
      hostname = "debbi";
      ip-addresses = [ "${ifs.lan.p6}::11:1" ];
    }
    {
      duid = "00:02:00:00:ab:11:6b:56:93:72:0b:3c:84:11";
      hostname = "etappi";
      ip-addresses = [ "${ifs.lan.p6}::12:1" ];
    }
  ];
  reservations.lan20.v4.reservations = [
    {
      # Router
      hw-address = "1c:3b:f3:da:5f:cc";
      hostname = "archer-ax3000";
      ip-address = "${ifs.lan20.p4}.2";
    }
    {
      # Printer
      hw-address = "30:cd:a7:c5:40:71";
      hostname = "SEC30CDA7C54071";
      ip-address = "${ifs.lan20.p4}.9";
    }
    {
      # 3D Printer
      hw-address = "20:f8:5e:ff:ae:5f";
      hostname = "GS_ffae5f";
      ip-address = "${ifs.lan20.p4}.11";
    }
    {
      hw-address = "70:85:c2:d8:87:3f";
      hostname = "Yura-PC";
      ip-address = "${ifs.lan20.p4}.40";
    }
  ];
 in
 {
  services.kea.dhcp4.enable = true;
  services.kea.dhcp4.settings = {
    interfaces-config.interfaces = [
      ifs.lan.name
      ifs.lan10.name
      ifs.lan20.name
      ifs.lan30.name
      ifs.lan40.name
      ifs.lan50.name
    ];
    dhcp-ddns.enable-updates = true;
    ddns-qualifying-suffix = "4.default.${ldomain}";
    subnet4 = [
      ((mkDhcp4Subnet 1 ifs.lan) // reservations.lan.v4)
      (mkDhcp4Subnet 10 ifs.lan10)
      ((mkDhcp4Subnet 20 ifs.lan20) // reservations.lan20.v4)
      (mkDhcp4Subnet 30 ifs.lan30)
      (mkDhcp4Subnet 40 ifs.lan40)
      (mkDhcp4Subnet 50 ifs.lan50)
    ];
  };
  services.kea.dhcp6.enable = true;
  services.kea.dhcp6.settings = {
    interfaces-config.interfaces = [
      ifs.lan.name
      ifs.lan10.name
      # ifs.lan20.name  # Managed by Att box
      ifs.lan30.name
      ifs.lan40.name
      ifs.lan50.name
    ];
    # TODO: https://kea.readthedocs.io/en/latest/arm/ddns.html#dual-stack-environments
    dhcp-ddns.enable-updates = true;
    ddns-qualifying-suffix = "6.default.${ldomain}";
    subnet6 = [
      ((mkDhcp6Subnet 1 ifs.lan) // reservations.lan.v6)
      (mkDhcp6Subnet 10 ifs.lan10)
      (mkDhcp6Subnet 30 ifs.lan30)
      (mkDhcp6Subnet 40 ifs.lan40)
      (mkDhcp6Subnet 50 ifs.lan50)
    ];
  };
  services.kea.dhcp-ddns.enable = true;
  services.kea.dhcp-ddns.settings = {
    forward-ddns.ddns-domains = [
      {
        name = "${ldomain}.";
        dns-servers = [ { ip-address = "::1"; port = 1053; } ];
      }
    ];
  };
 }
--- a/hosts/router/services.nix
+++ b/hosts/router/services.nix
@@ -0,0 +1,50 @@
 { config, lib, pkgs, ... }:
 let
  vars = import ./vars.nix;
  domain = vars.domain;
 in
 {
  # https://wiki.nixos.org/wiki/Prometheus
  services.prometheus = {
    enable = true;
    exporters = {
      # TODO: DNS, Kea, Knot, other exporters
      node = {
        enable = true;
        enabledCollectors = [ "systemd" ];
      };
    };
    scrapeConfigs = [
      {
        job_name = "node";
        static_configs = [{
          targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ];
        }];
      }
    ];
  };
  # https://wiki.nixos.org/wiki/Grafana#Declarative_configuration
  services.grafana = {
    enable = true;
    settings.server.http_port = 3001;
    provision = {
      enable = true;
      datasources.settings.datasources = [
        {
          name = "Prometheus";
          type = "prometheus";
          url = "http://localhost:${toString config.services.prometheus.port}";
        }
      ];
    };
  };
  services.caddy = {
    enable = true;
    virtualHosts."grouter.${domain}".extraConfig = ''
      reverse_proxy localhost:${toString config.services.grafana.settings.server.http_port}
      tls internal
    '';
  };
 }
--- a/hosts/router/vars.nix
+++ b/hosts/router/vars.nix
@@ -0,0 +1,98 @@
 let
  mkIfConfig = {
    name_,
    domain_,
    p4_,  # /24
    p6_,  # /64
    ulaPrefix_,  # /64
    token? 1,
    ip6Token_? "::${toString token}",
    ulaToken_? "::${toString token}",
    }: rec {
      name = name_;
      domain = domain_;
      p4 = p4_;
      p4Size = 24;
      net4 = "${p4}.0/${toString p4Size}";
      addr4 = "${p4}.${toString token}";
      addr4Sized = "${addr4}/${toString p4Size}";
      p6 = p6_;
      p6Size = 64;
      net6 = "${p6}::/${toString p6Size}";
      ip6Token = ip6Token_;
      addr6 = "${p6}${ip6Token}";
      addr6Sized = "${addr6}/${toString p6Size}";
      ulaPrefix = ulaPrefix_;
      ulaSize = 64;
      ulaNet = "${ulaPrefix}::/${toString ulaSize}";
      ulaToken = ulaToken_;
      ulaAddr = "${ulaPrefix}${ulaToken}";
      ulaAddrSized = "${ulaAddr}/${toString ulaSize}";
    };
 in
 rec {
  domain = "cazzzer.com";
  ldomain = "l.${domain}";
  sysdomain = "sys.${domain}";
  links = {
    wanMAC = "bc:24:11:4f:c9:c4";
    lanMAC = "bc:24:11:83:d8:de";
    wanLL = "fe80::be24:11ff:fe4f:c9c4";
    lanLL = "fe80::be24:11ff:fe83:d8de";
  };
  p4 = "10.17";                      # .0.0/16
  pdFromWan = "";  # ::/60
  ulaPrefix = "fdab:07d3:581d";      # ::/48
  ifs = rec {
    wan = rec {
      name = "wan";
      addr4 = "192.168.1.61";
      addr4Sized = "${addr4}/24";
      gw4 = "192.168.1.254";
    };
    lan = mkIfConfig {
      name_ = "lan";
      domain_ = "lan.${ldomain}";
      p4_ = "${p4}.1";                   # .0/24
      p6_ = "${pdFromWan}f";             # ::/64
      ulaPrefix_ = "${ulaPrefix}:0001";  # ::/64
    };
    lan10 = mkIfConfig {
      name_ = "${lan.name}.10";
      domain_ = "lab.${ldomain}";
      p4_ = "${p4}.10";                  # .0/24
      p6_ = "${pdFromWan}e";             # ::/64
      ulaPrefix_ = "${ulaPrefix}:0010";  # ::/64
    };
    lan20 = mkIfConfig {
      name_ = "${lan.name}.20";
      domain_ = "life.${ldomain}";
      p4_ = "${p4}.20";                  # .0/24
      p6_ = "${pdFromWan}0";             # ::/64 managed by Att box
      ulaPrefix_ = "${ulaPrefix}:0020";  # ::/64
      ip6Token_ = "::1:1";  # override ipv6 for lan20, since the Att box uses ::1 here
    };
    lan30 = mkIfConfig {
      name_ = "${lan.name}.30";
      domain_ = "iot.${ldomain}";
      p4_ = "${p4}.30";                  # .0/24
      p6_ = "${pdFromWan}c";             # ::/64
      ulaPrefix_ = "${ulaPrefix}:0030";  # ::/64
    };
    lan40 = mkIfConfig {
      name_ = "${lan.name}.40";
      domain_ = "kube.${ldomain}";
      p4_ = "${p4}.40";                  # .0/24
      p6_ = "${pdFromWan}b";             # ::/64
      ulaPrefix_ = "${ulaPrefix}:0040";  # ::/64
    };
    lan50 = mkIfConfig {
      name_ = "${lan.name}.50";
      domain_ = "prox.${ldomain}";
      p4_ = "${p4}.50";                  # .0/24
      p6_ = "${pdFromWan}a";             # ::/64
      ulaPrefix_ = "${ulaPrefix}:0050";  # ::/64
    };
  };
 }
--- a/hosts/vm/default.nix
+++ b/hosts/vm/default.nix
@@ -0,0 +1,131 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 { config, lib, pkgs, ... }:
 {
  imports =
    [ # Include the results of the hardware scan.
 #      ./hardware-configuration-vm.nix
    ];
  mods.kb-input.enable = false;
  # Bootloader.
  boot.loader.systemd-boot.enable = true;
  boot.loader.efi.canTouchEfiVariables = true;
  boot.plymouth.enable = true;
  boot.plymouth.theme = "breeze";
  boot.kernelParams = [
    "sysrq_always_enabled=1"
  ];
  boot.loader.systemd-boot.configurationLimit = 5;
  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
  environment.etc.hosts.mode = "0644";
  # managed by cloud-init
  # networking.hostName = "nixos"; # Define your hostname.
  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
  # Configure network proxy if necessary
  # networking.proxy.default = "http://user:password@proxy:port/";
  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
  # Enable networking
  networking.networkmanager.enable = true;
  # Enable the X11 windowing system.
  # You can disable this if you're only using the Wayland session.
  services.xserver.enable = false;
  # Enable the KDE Plasma Desktop Environment.
  services.displayManager.sddm.enable = true;
  services.displayManager.sddm.wayland.enable = true;
  services.desktopManager.plasma6.enable = true;
  services.flatpak.enable = true;
  # VM services
  services.cloud-init.enable = true;
 #  services.cloud-init.network.enable = false;
  services.qemuGuest.enable = true;
  services.spice-vdagentd.enable = true;
  services.openssh.enable = true;
  services.openssh.settings.PasswordAuthentication = false;
  services.openssh.settings.KbdInteractiveAuthentication = false;
  security.sudo.wheelNeedsPassword = false;
  users.groups = {
    cazzzer = {
      gid = 1000;
    };
  };
  users.users.cazzzer = {
    password = "";
    openssh.authorizedKeys.keys = [
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPWgEzbEjbbu96MVQzkiuCrw+UGYAXN4sRe2zM6FVopq cazzzer@Yura-PC"
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIApFeLVi3BOquL0Rt+gQK2CutNHaBDQ0m4PcGWf9Bc43 cazzzer@Yura-TPX13"
    ];
    isNormalUser = true;
    description = "Yura";
    uid = 1000;
    group = "cazzzer";
    extraGroups = [ "wheel" "docker" "wireshark" ];
  };
  # Install firefox.
  programs.firefox.enable = true;
  programs.fish.enable = true;
  programs.git.enable = true;
  programs.neovim.enable = true;
  programs.bat.enable = true;
  programs.htop.enable = true;
  programs.wireshark.enable = true;
  # List packages installed in system profile. To search, run:
  # $ nix search wget
  # https://github.com/flatpak/flatpak/issues/2861
  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
 #  workarounds.flatpak.enable = true;
  fonts.packages = with pkgs; [
    noto-fonts-cjk-sans
    noto-fonts-cjk-serif
    fantasque-sans-mono
    nerd-fonts.fantasque-sans-mono
    jetbrains-mono
  ];
  environment.systemPackages = with pkgs; [
    dust
    eza
    fastfetch
    fd
    host-spawn # for flatpaks
    kdePackages.flatpak-kcm
    kdePackages.filelight
    kdePackages.kate
    kdePackages.yakuake
    ldns
    micro
    mpv
    ripgrep
    starship
    tealdeer
    waypipe
    whois
    zfs
  ];
  # This value determines the NixOS release from which the default
  # settings for stateful data, like file locations and database versions
  # on your system were taken. It‘s perfectly fine and recommended to leave
  # this value at the release version of the first install of this system.
  # Before changing this value read the documentation for this option
  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
  system.stateVersion = "24.11"; # Did you read the comment?
 }
--- a/hosts/vm/hardware-configuration.nix
+++ b/hosts/vm/hardware-configuration.nix
@@ -0,0 +1,37 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 {
  imports =
    [ (modulesPath + "/profiles/qemu-guest.nix")
    ];
  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ ];
  boot.extraModulePackages = [ ];
  fileSystems."/" =
    { device = "/dev/disk/by-uuid/da85e220-e2b0-443a-9a0c-a9516b8e5030";
      fsType = "ext4";
    };
  fileSystems."/boot" =
    { device = "/dev/disk/by-uuid/3F96-8974";
      fsType = "vfat";
      options = [ "fmask=0022" "dmask=0022" ];
    };
  swapDevices = [ ];
  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
  # (the default) this is the recommended approach. When using systemd-networkd it's
  # still possible to use this option, but it's recommended to use it in conjunction
  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
  networking.useDHCP = lib.mkDefault true;
  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
--- a/hosts/vm/proxmox.nix
+++ b/hosts/vm/proxmox.nix
@@ -0,0 +1,11 @@
 { ... }:
 {
 #  boot.kernelParams = [ "console=tty0" ];
  proxmox.qemuConf.bios = "ovmf";
  proxmox.qemuExtraConf = {
    machine = "q35";
 #    efidisk0 = "local-lvm:vm-9999-disk-1";
    cpu = "host";
  };
 }
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -0,0 +1,6 @@
 { ... }: {
  imports = [
    ./mods
    ./workarounds
  ];
 }
--- a/modules/mods/default.nix
+++ b/modules/mods/default.nix
@@ -0,0 +1,5 @@
 { ... }: {
  imports = [
    ./kb-input.nix
  ];
 }
--- a/modules/mods/kb-input.nix
+++ b/modules/mods/kb-input.nix
@@ -0,0 +1,52 @@
 {
  pkgs,
  config,
  lib,
  ...
 }: let
  cfg = config.mods.kb-input;
 in {
  options = {
    mods.kb-input = {
      enable = lib.mkEnableOption "input method and custom keyboard layout";
      enableMinimak = lib.mkOption {
        type = lib.types.bool;
        default = true;
        description = "Enable Minimak keyboard layout";
      };
      enableFcitx = lib.mkOption {
        type = lib.types.bool;
        default = true;
        description = "Enable Fcitx5 input method";
      };
    };
  };
  config = lib.mkIf cfg.enable {
    services.xserver.xkb.extraLayouts = lib.mkIf cfg.enableMinimak {
      minimak-4 = {
        description = "English (US, Minimak-4)";
        languages = [ "eng" ];
        symbolsFile = ./minimak;
      };
      minimak-8 = {
        description = "English (US, Minimak-8)";
        languages = [ "eng" ];
        symbolsFile = ./minimak;
      };
      minimak-12 = {
        description = "English (US, Minimak-12)";
        languages = [ "eng" ];
        symbolsFile = ./minimak;
      };
    };
    i18n.inputMethod = lib.mkIf cfg.enableFcitx {
      enable = true;
      type = "fcitx5";
      fcitx5.waylandFrontend = true;
      fcitx5.plasma6Support = true;
      fcitx5.addons = [ pkgs.fcitx5-mozc ];
    };
  };
 }
--- a/modules/mods/minimak
+++ b/modules/mods/minimak
--- a/modules/workarounds/default.nix
+++ b/modules/workarounds/default.nix
@@ -0,0 +1,5 @@
 {
  imports = [
    ./flatpak.nix
  ];
 }
--- a/modules/workarounds/flatpak.nix
+++ b/modules/workarounds/flatpak.nix
@@ -0,0 +1,44 @@
 # https://github.com/knightpp/nixos-cfg/blob/main/modules/workarounds/flatpak.nix
 {
  pkgs,
  config,
  lib,
  ...
 }: let
  cfg = config.workarounds.flatpak;
 in {
  options = {
    workarounds.flatpak = {
      enable = lib.mkEnableOption "flatpak workaround";
    };
  };
  config = lib.mkIf cfg.enable {
    system.fsPackages = [pkgs.bindfs];
    fileSystems = let
      mkRoSymBind = path: {
        device = path;
        fsType = "fuse.bindfs";
        options = ["ro" "resolve-symlinks" "x-gvfs-hide"];
      };
      aggregated = pkgs.buildEnv {
        name = "system-fonts-and-icons";
        paths = builtins.attrValues {
          inherit (pkgs.kdePackages) breeze;
          inherit
            (pkgs)
            noto-fonts
            noto-fonts-emoji
            noto-fonts-cjk-sans
            noto-fonts-cjk-serif
            ;
        };
        pathsToLink = ["/share/fonts" "/share/icons"];
      };
    in {
      # Create an FHS mount to support flatpak host icons/fonts
      "/usr/share/icons" = mkRoSymBind "${aggregated}/share/icons";
      "/usr/share/fonts" = mkRoSymBind "${aggregated}/share/fonts";
    };
  };
 }
Author	SHA1	Message	Date
Yuri Tatishchev	07b5990373	router: firewall: proper filtering for hosts proxied by cloudflare	2025-03-26 00:24:16 -07:00
Yuri Tatishchev	ac1f427677	router: dns: add more upstream providers; add sysdomain hosts for truenas, debbi, etappi	2025-03-26 00:21:19 -07:00
Yuri Tatishchev	c353ec4020	router: refactor config into separate files, add workaround for networkd issues	2025-03-26 00:18:45 -07:00
Yuri Tatishchev	ec6b149bfa	updates: nixpkgs, home-manager, plasma-manager, nixos-generators	2025-03-25 20:58:32 -07:00
Yuri Tatishchev	0a959ac3c7	updates: nixpkgs	2025-03-13 10:56:20 -07:00
Yuri Tatishchev	a265d9b844	router: migrate remaining VLANs, add ULA prefix router adverts	2025-03-04 21:29:09 -08:00
Yuri Tatishchev	06dbcec84d	WIP: router: migrate vlan 1, 30, 40 from opnsense, add DNS records for alpina services	2025-03-01 22:35:36 -08:00
Yuri Tatishchev	32b3775709	pc: add gleam	2025-02-27 22:19:34 -08:00
Yuri Tatishchev	d134f0758e	home: add kde keyboard layouts, fish, starship config	2025-02-26 21:37:19 -08:00
Yuri Tatishchev	d5d34f48b4	WIP: router: add remaining VLANs, temporary network configs Retiring OPNsense will take a while, in the meantime it should work together	2025-02-26 00:00:13 -08:00
Yuri Tatishchev	17e6b33bde	home: plasma start with empty session	2025-02-25 23:54:59 -08:00
Yuri Tatishchev	f2704d6103	pc: disable docker zfs driver. updates: nixpkgs	2025-02-24 23:48:45 -08:00
Yuri Tatishchev	1923c3814b	home: add gnome-keyring, adjust plasma settings	2025-02-21 01:56:42 -08:00
Yuri Tatishchev	e17d61e5b6	WIP: pc: add plasma-manager, darkman	2025-02-19 21:15:02 -08:00
Yuri Tatishchev	f3bf750fb2	WIP: pc: add home-manager	2025-02-19 17:25:12 -08:00
Yuri Tatishchev	ba48dd8706	WIP: router: refactor dhcp configs	2025-02-17 22:56:06 -08:00
Yuri Tatishchev	b1bc0c3923	updates: nixpkgs	2025-02-17 22:55:22 -08:00
Yuri Tatishchev	cb3690c6e2	WIP: router firewall refactor	2025-02-12 10:59:15 -08:00
Yuri Tatishchev	17fdd35fb2	WIP: router interfaces refactor	2025-02-12 10:58:14 -08:00
Yuri Tatishchev	83bfc367f6	updates: nixpkgs	2025-02-01 18:26:29 -08:00
Yuri Tatishchev	042a3c5a71	WIP: router replace CoreDNS with AdGuard Home	2025-01-24 17:04:56 -08:00
Yuri Tatishchev	74f9b65585	WIP: router monitoring (prometheus, grafana)	2025-01-24 11:09:38 -08:00
Yuri Tatishchev	80b743816c	WIP: router dhcp ddns v6	2025-01-23 20:40:13 -08:00
Yuri Tatishchev	d43c8112ff	WIP: router dhcp ddns (absolutely cooking)	2025-01-18 03:14:15 -08:00
Yuri Tatishchev	781b159461	WIP: router dns (absolutely cooking)	2025-01-17 00:38:58 -08:00
Yuri Tatishchev	b5d11fe2d7	WIP: router firewall	2025-01-16 19:30:31 -08:00
Yuri Tatishchev	5559e6bc95	WIP: add router configuration	2025-01-15 00:14:30 -08:00
Yuri Tatishchev	c8f9d65f2d	vm: move proxmox specific configuration into hosts/vm/proxmox.nix	2025-01-14 01:11:43 -08:00
Yuri Tatishchev	d880a8d159	pc: add jetbrains IDEs; update nixpkgs	2025-01-13 16:03:54 -08:00
Yuri Tatishchev	cc77980436	vm: nopasswd sudo, network experiments	2025-01-09 01:27:30 -08:00
Yuri Tatishchev	a9066b0f9c	update nixpkgs	2025-01-08 22:21:44 -08:00
Yuri Tatishchev	79a0495760	move out some common host settings to hosts/common.nix	2025-01-08 22:21:39 -08:00
Yuri Tatishchev	f30ff9962c	refactor, add common modules	2025-01-08 21:44:48 -08:00
Yuri Tatishchev	00af4d57aa	add vm config	2025-01-06 19:38:14 -08:00
Yuri Tatishchev	0fdd9efff2	flatpak font workarounds	2025-01-06 17:59:14 -08:00
Yuri Tatishchev	d7c234db82	updates: linux 6.12	2025-01-05 18:04:36 -08:00