nixos 26.05

2026-06-01 20:42:33 -05:00 · 2026-06-01 20:19:50 -05:00 · 2026-06-01 20:18:41 -05:00 · 2026-06-01 19:55:01 -05:00 · 2026-06-01 19:51:17 -05:00 · 2026-06-01 19:43:41 -05:00
31 changed files with 549 additions and 372 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776702787,
-        "narHash": "sha256-qc5uwEWbuubzYthmZcfCapooZGXhoYZWfTQ24TozbCQ=",
+        "lastModified": 1778857089,
+        "narHash": "sha256-TclWRW2SdFeETLaiTG4BA8C8C4m/LppQEldncqyTzAQ=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "9a1ca6b8cb4d86a599787a55b78f2ddf809bf945",
+        "rev": "ab2b0af63fbc9fb779d684f19149b790978be8a8",
        "type": "github"
      },
      "original": {
@@ -47,11 +47,11 @@
        "rev": "b2ec3d9cd0a6e52c4922b26d8b8e25823afd89d1",
        "revCount": 52,
        "type": "git",
-        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora"
+        "url": "https://gitea.esotericbytes.com/nathan/Aurora"
      },
      "original": {
        "type": "git",
-        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora"
+        "url": "https://gitea.esotericbytes.com/nathan/Aurora"
      }
    },
    "disko": {
@@ -61,11 +61,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776613567,
-        "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=",
+        "lastModified": 1780290312,
+        "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d",
+        "rev": "115e5211780054d8a890b41f0b7734cafad54dfe",
        "type": "github"
      },
      "original": {
@@ -82,11 +82,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1777003388,
-        "narHash": "sha256-IS8oeyaqYS/MPpDp0Z7i86PwcdTqJ2dritgdRtWzkew=",
+        "lastModified": 1780286561,
+        "narHash": "sha256-73UvAlulbn6cSaoq+Wllj7WxKrhti8wkT+zYKvFD9d0=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "03d4270c1f75494910b7b8039b1a050bc7055c97",
+        "rev": "2838055f920c314b0731f71a53a6b878de0309cc",
        "type": "gitlab"
      },
      "original": {
@@ -135,11 +135,11 @@
        "nixpkgs-lib": "nixpkgs-lib_2"
      },
      "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
        "type": "github"
      },
      "original": {
@@ -235,30 +235,30 @@
        ]
      },
      "locked": {
-        "lastModified": 1775425411,
-        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
+        "lastModified": 1780341248,
+        "narHash": "sha256-PPWavrpeQFqE3bEShp9xcWeh2xyVbUucjBbG64MLRl0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
+        "rev": "4baa8ac595f6122d2899093f575347af9c4e66d7",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
    "home-manager_3": {
      "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1777004352,
-        "narHash": "sha256-SV+9PgNwZ8jHVCjK6YaCBzaheLSW7cDnm5DpOYrD8Vw=",
+        "lastModified": 1780347968,
+        "narHash": "sha256-I8ibSDQx+E8cgw6k3UxX6Bm7awmGoKSTXc8Gt1Zbpp4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "6012cf1fed3eba66115f3fd117b9be6bd2a15b2f",
+        "rev": "d0af9b8bf3b4a1d449be7034bebc9f8f9fd6ee99",
        "type": "github"
      },
      "original": {
@@ -342,11 +342,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1776947531,
-        "narHash": "sha256-BnUJwexEDpt10Csws8UNq/34r5zaUl8oXNrDHd6oJVA=",
+        "lastModified": 1780334452,
+        "narHash": "sha256-v+GmvijnXvcpN7pMrKFSYnNozYZ/hz5w7fsswLaT7DM=",
        "ref": "refs/heads/main",
-        "rev": "b65714e3b8e123fb2febd507905d25fa6abd0400",
-        "revCount": 7171,
+        "rev": "13be9a3305150fa9b9492418bbc409707129ab44",
+        "revCount": 7402,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -444,11 +444,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776426736,
-        "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=",
+        "lastModified": 1777320127,
+        "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9",
+        "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc",
        "type": "github"
      },
      "original": {
@@ -521,11 +521,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776428866,
-        "narHash": "sha256-XfRlBolGtjvalTHJp3XvvpYLBjkMhaZLLU0WqZ91Fcg=",
+        "lastModified": 1779475241,
+        "narHash": "sha256-Nw4DN0A5krWNcPBvuWe5Gz2yuxsUUPiDgtu6SVPJQeU=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "eedd60805cd96d4442586f2ba5fe51d549b12674",
+        "rev": "3cd3972b2ee658a14d2610d8494e09259e530124",
        "type": "github"
      },
      "original": {
@@ -546,11 +546,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776430932,
-        "narHash": "sha256-Yv3RPiUvl7CAsJgwIVsqcj7akn1gLyJP1F/mocof5hA=",
+        "lastModified": 1777159683,
+        "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "4c2fcc06dc9722c97dbb54ba649c69b18ce83d2e",
+        "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404",
        "type": "github"
      },
      "original": {
@@ -575,11 +575,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776728575,
-        "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=",
+        "lastModified": 1778410714,
+        "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=",
        "owner": "hyprwm",
        "repo": "hyprwire",
-        "rev": "f3a80888783702a39691b684d099e16b83ed4702",
+        "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc",
        "type": "github"
      },
      "original": {
@@ -605,11 +605,11 @@
    },
    "import-tree_2": {
      "locked": {
-        "lastModified": 1773693634,
-        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
+        "lastModified": 1778781969,
+        "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=",
        "owner": "vic",
        "repo": "import-tree",
-        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
+        "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274",
        "type": "github"
      },
      "original": {
@@ -619,12 +619,15 @@
      }
    },
    "nixos-hardware": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
      "locked": {
-        "lastModified": 1776983936,
-        "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
+        "lastModified": 1780310866,
+        "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
+        "rev": "4ed851c979641e28597a05086332d75cdc9e395f",
        "type": "github"
      },
      "original": {
@@ -667,11 +670,11 @@
    },
    "nixpkgs-lib_2": {
      "locked": {
-        "lastModified": 1774748309,
-        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "lastModified": 1777168982,
+        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
        "type": "github"
      },
      "original": {
@@ -697,11 +700,11 @@
    },
    "nixpkgs-us": {
      "locked": {
-        "lastModified": 1776548001,
-        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
+        "lastModified": 1780243769,
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
        "type": "github"
      },
      "original": {
@@ -729,11 +732,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1776548001,
-        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
+        "lastModified": 1779357205,
+        "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
+        "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1",
        "type": "github"
      },
      "original": {
@@ -745,37 +748,50 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1776734388,
-        "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
-        "type": "github"
+        "lastModified": 1767892417,
+        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
      }
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1775423009,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
-        "owner": "NixOS",
+        "lastModified": 1780203844,
+        "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=",
+        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "owner": "nixos",
+        "ref": "nixos-26.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1779877693,
+        "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
      "locked": {
        "lastModified": 1775710090,
        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
@@ -791,7 +807,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
      "locked": {
        "lastModified": 1774701658,
        "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=",
@@ -807,7 +823,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
      "locked": {
        "lastModified": 1772047000,
        "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
@@ -827,7 +843,7 @@
      "inputs": {
        "flake-parts": "flake-parts_3",
        "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
        "nixvim": "nixvim_2"
      },
      "locked": {
@@ -837,17 +853,17 @@
        "rev": "7fb16160f7170a580d6791d0f26736ff68cceb3c",
        "revCount": 40,
        "type": "git",
-        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
+        "url": "https://gitea.esotericbytes.com/nathan/Moirai"
      },
      "original": {
        "type": "git",
-        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
+        "url": "https://gitea.esotericbytes.com/nathan/Moirai"
      }
    },
    "nixvim_2": {
      "inputs": {
        "flake-parts": "flake-parts_4",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_8",
        "systems": "systems_2"
      },
      "locked": {
@@ -864,24 +880,41 @@
        "type": "github"
      }
    },
-    "opi-zero2w": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_8"
-      },
+    "odysseus": {
+      "flake": false,
      "locked": {
-        "lastModified": 1772415536,
-        "narHash": "sha256-dS4XyDDVCjGEFDX4zgaalQqMlfWL7JfeLGJpLwcAAFE=",
-        "owner": "virusdave",
-        "repo": "nixos-opi-zero2w",
-        "rev": "1337ecfb2443f059f8971eb89eae487fbc6b0dcc",
+        "lastModified": 1780360943,
+        "narHash": "sha256-hFdFwPmZrfugsvhZRZhPUiBrGR8bjRg5XWUUWaOG2KA=",
+        "owner": "pewdiepie-archdaemon",
+        "repo": "odysseus",
+        "rev": "d60ff44c1b43b7f334ee2b22304ac9bbca90796c",
        "type": "github"
      },
      "original": {
-        "owner": "virusdave",
-        "repo": "nixos-opi-zero2w",
+        "owner": "pewdiepie-archdaemon",
+        "repo": "odysseus",
        "type": "github"
      }
    },
+    "opi-zero2w": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_9"
+      },
+      "locked": {
+        "lastModified": 1777256028,
+        "narHash": "sha256-C05MeufANuAQxLytQDhfzCKtjqL6cKi9QaWhgI7BGZI=",
+        "ref": "ccacheless",
+        "rev": "b794fd757ef0f6d044548c9262fc4143a5b33f6d",
+        "revCount": 5,
+        "type": "git",
+        "url": "https://gitea.esotericbytes.com/nathan/nixos-opi-zero2w"
+      },
+      "original": {
+        "ref": "ccacheless",
+        "type": "git",
+        "url": "https://gitea.esotericbytes.com/nathan/nixos-opi-zero2w"
+      }
+    },
    "pre-commit-hooks": {
      "inputs": {
        "flake-compat": "flake-compat",
@@ -892,11 +925,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776796298,
-        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
+        "lastModified": 1778507602,
+        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
+        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
        "type": "github"
      },
      "original": {
@@ -915,9 +948,10 @@
        "hyprland": "hyprland",
        "import-tree": "import-tree_2",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
        "nixpkgs-us": "nixpkgs-us",
        "nixvim": "nixvim",
+        "odysseus": "odysseus",
        "opi-zero2w": "opi-zero2w",
        "sops-nix": "sops-nix"
      }
@@ -929,11 +963,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776771786,
-        "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
+        "lastModified": 1777944972,
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
        "type": "github"
      },
      "original": {
@@ -1000,11 +1034,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776608502,
-        "narHash": "sha256-UH8YoQxx4hFOm6qjMdjRQNRvSejFIR/wBZ8fW1p9sME=",
+        "lastModified": 1778265244,
+        "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4a293523d36dfa367e67ec304cc718ea66a8fec2",
+        "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -2,12 +2,15 @@
    description = "Nixos config flake";
     
    inputs = {
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+        
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
+        #nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";

        nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";

        home-manager = {
-            url = "github:nix-community/home-manager/release-25.11";
+            url = "github:nix-community/home-manager/release-26.05";
+            #url = "github:nix-community/home-manager/release-25.11";
            inputs.nixpkgs.follows = "nixpkgs";
        };

@@ -18,8 +21,8 @@

        nixos-hardware.url = "github:nixos/nixos-hardware/master";

-        opi-zero2w.url = "github:virusdave/nixos-opi-zero2w";
-        #opi-zero2w.url = "git+file:///home/nathan/Projects/tests/nixos-opi-zero2w";
+        #opi-zero2w.url = "github:virusdave/nixos-opi-zero2w";
+        opi-zero2w.url = "git+https://gitea.esotericbytes.com/nathan/nixos-opi-zero2w?ref=ccacheless";

        sops-nix = {
            url = "github:Mic92/sops-nix";
@@ -35,12 +38,18 @@
            inputs.nixpkgs.follows = "nixpkgs";
        };

+        odysseus = {
+            url = "github:pewdiepie-archdaemon/odysseus";
+            flake = false;
+        };
+        
+
        hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";

-        nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
+        nixvim.url = "git+https://gitea.esotericbytes.com/nathan/Moirai";
        #nixvim.url = "git+file:///home/nathan/Projects/Moirai";

-        aurora.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora";
+        aurora.url = "git+https://gitea.esotericbytes.com/nathan/Aurora";
        #aurora.url = "git+file:///home/nathan/Projects/Aurora";
    };

--- a/modules/features/authentik.nix
+++ b/modules/features/authentik.nix
@@ -16,12 +16,6 @@

        config = {

-            networking.firewall.interfaces = {
-                "ve-traefik" = {
-                    allowedTCPPorts = [ hostPort ];
-                };
-            };
-
            sops.secrets = {
                "authentik/pass" = {};
                "authentik/secret_key" = {};
@@ -90,12 +84,15 @@
                environmentFiles = [ config.sops.templates."authentik.env".path ];
                labels = {
                    "traefik.enable" = "true";
+                    "traefik.docker.network" = "docker-main";
                    "traefik.http.routers.${name}.entrypoints" = "websecure,localsecure";
                    "traefik.http.routers.${name}.rule" = "Host(`${subdomain}.esotericbytes.com`)";
                    "traefik.http.routers.${name}.service" = "${name}";
                    "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";

-                    "traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.101.1:${builtins.toString hostPort}";
+                    #"traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.101.1:${builtins.toString hostPort}";
+                    "traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.101.6:9000";
+                    #"traefik.http.services.${name}.loadbalancer.server.port" = "${builtins.toString hostPort}";


                    "traefik.http.middlewares.authentik.forwardauth.address" = "https://auth.esotericbytes.com/outpost.goauthentik.io/auth/traefik";
@@ -108,7 +105,7 @@
                        "/etc/Authentik/data:/data:rw"
                ];
                ports = [
-                    "${builtins.toString hostPort}:9000/tcp"
+                    #"127.0.0.1:${builtins.toString hostPort}:9000/tcp"
 #"9443:9443/tcp"
                ];
                cmd = [ "server" ];
@@ -121,10 +118,11 @@
                        "--network-alias=authentik-server"
                        "--network-alias=${name}"
                        "--ip=192.168.101.6"
+                        #"--expose=9000"
                ];
                networks = [
                    "docker-main"
-                        "authentik_default"
+                    "authentik_default"
                ];
            };
            systemd.services."docker-authentik-server" = {
--- a/modules/features/avahi.nix
+++ b/modules/features/avahi.nix
@@ -11,7 +11,7 @@
                ipv6 = true;
                openFirewall = true;
                nssmdns4 = true;
-                wideArea = true;
+                wideArea = false;

            };   
        };
--- a/modules/features/blueman.nix
+++ b/modules/features/blueman.nix
@@ -0,0 +1,12 @@
+{ ... }: {
+
+    flake.nixosModules.default = { ... }: {
+
+        config = {
+
+            services.blueman = {
+                enable = true;
+            };   
+        };
+    };
+}
--- a/modules/features/gitea.nix
+++ b/modules/features/gitea.nix
@@ -1,120 +1,5 @@
 { ... }: {

-    flake.nixosModules.gitea = { config, lib, ... }: {
-
-        config = {
-
-            networking = {
-                nat.internalInterfaces = [ "ve-gitea" ];
-            };
-
-            sops.secrets = {
-                "gitea/dbpass" = {};
-            };
-
-            containers.gitea = {
-
-                autoStart = true;
-                privateNetwork = true;
-                hostAddress = "192.168.100.10";
-                localAddress = "192.168.100.20";
-
-                bindMounts = {
-                    "/etc/gitea/data" = {
-                        hostPath = "/ssd1/Gitea/data";
-                        isReadOnly = false;
-                    };
-                };
-
-                extraFlags = [
-                    "--load-credential=dbpass:${config.sops.secrets."gitea/dbpass".path}"
-                ];
-                
-                config = {
-
-                    systemd.services.secrets_setup = {
-                        wantedBy = [ "gitea.service" ];
-
-                        serviceConfig = {
-                            LoadCredential = [
-                                "dbpass"
-                            ];
-                        };
-
-                        script = ''
-                            cat ''${CREDENTIALS_DIRECTORY}/dbpass > /etc/gitea/dbpass
-                            chown gitea:gitea /etc/gitea/*
-                        '';
-                    };
-
-                    services.gitea = {
-                        enable = true;
-
-                        stateDir = "/etc/gitea/data";
-
-                        dump.enable = false;
-
-                        appName = "Gitea";
-
-                        settings = {
-                            server = {
-                                DOMAIN = "gitea.esotericbytes.com";
-                                HTTP_PORT = 3000;
-                                ROOT_URL = "https://gitea.esotericbytes.com/";
-                            };
-                            service = {
-                                DISABLE_REGISTRATION = false;
-                                ALLOW_ONLY_EXTERNAL_REGISTRATION = true;
-                                REQUIRE_SIGNIN_VIEW = false;
-                            };
-                            oauth2_client = {
-                                ENABLE_AUTO_REGISTRATION = true;
-                            };
-                            session.COOKIE_SECURE = true;
-
-                            cron = {
-                                ENABLED = true;
-                                RUN_AT_START = true;
-                            };
-
-                            repository = {
-                                DEFAULT_BRANCH = "master";
-                            };
-
-                            migrations = {
-                                ALLOWED_DOMAINS = "*";
-                                ALLOW_LOCALNETWORKS = true;
-                                SKIP_TLS_VERIFY = true;
-                                BLOCKED_DOMAINS = "";
-                            };
-                        };
-
-                        database = {
-                            passwordFile = "/etc/gitea/dbpass";
-                            type = "postgres";
-                        };
-
-                    };
-
-                    services.openssh = {
-                        enable = true;
-                        openFirewall = true;
-                        settings = {
-                            PermitRootLogin = lib.mkForce "no";
-                            PasswordAuthentication = false;
-                            KbdInteractiveAuthentication = false;
-                        };
-                        ports = [ 2222 ];
-                    };
-
-                    networking.firewall.allowedTCPPorts = [ 3000 ];
-
-                    system.stateVersion = "24.11";
-                };
-            };
-        };
-    };
-
    flake.nixosModules.gitea-docker = { config, lib, pkgs, ... }: let

    subdomain = "gitea";
@@ -145,7 +30,6 @@
                POSTGRES_DB=gitea
                POSTGRES_PASSWORD=${config.sops.placeholder."gitea/dbpass"}
            '';
->>>>>>> dev

            virtualisation.oci-containers.containers."${name}" = {
                image = "docker.gitea.com/gitea:1.25.4";
@@ -161,7 +45,7 @@

                labels = {
                    "traefik.enable" = "true";
-                    "traefik.http.routers.${name}.entrypoints" = "websecure";
+                    "traefik.http.routers.${name}.entrypoints" = "websecure,localsecure";
                    "traefik.http.routers.${name}.rule" = "Host(`${subdomain}.esotericbytes.com`)";
                    "traefik.http.routers.${name}.service" = "${name}";
                    "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";
@@ -173,12 +57,9 @@
                    "traefik.tcp.routers.${name}-ssh.rule" = "HostSNI(`*`)";
                    "traefik.tcp.routers.${name}-ssh.service" = "${name}-ssh";

-                    "traefik.tcp.services.${name}-ssh.loadbalancer.server.port" = "2222";
+                    "traefik.tcp.services.${name}-ssh.loadbalancer.server.port" = "22";
                };

-                ports = [
-                ];
-
                extraOptions = [
                    "--ip=192.168.101.25"
                ];
@@ -208,12 +89,6 @@
                    "docker-main"
                ];

-                labels = {
-                };
-
-                ports = [
-                ];
-
                extraOptions = [
                    "--ip=192.168.101.26"
                ];
--- a/modules/features/home-assistant/home-assistant.nix
+++ b/modules/features/home-assistant/home-assistant.nix
@@ -48,9 +48,6 @@
                    "--ip=192.168.101.13"
                ];

-                ports = [
-                ];
-
                volumes = [
                    "vol_home-assistant:/config/"
                        "/etc/home-assistant/configuration.yaml:/config/configuration.yaml"
--- a/modules/features/jellyfin.nix
+++ b/modules/features/jellyfin.nix
@@ -15,8 +15,6 @@

        config = {

-            networking.firewall.allowedUDPPorts = [ 7359 ];
-
            virtualisation.oci-containers.containers.jellyfin = {
                image = "jellyfin/jellyfin:10.11.6";

@@ -29,10 +27,6 @@
                    "docker-main"
                ];

-                ports = [
-                    "7359:7359/udp"
-                ];
-
                volumes = [
                    "vol_jellyfin-config:/config"
                        "vol_jellyfin-cache:/cache"
--- a/modules/features/minecraft.nix
+++ b/modules/features/minecraft.nix
@@ -1 +1,92 @@
-{}
+{ self, ... }: {
+
+    flake.nixosModules.minecraft = { config, lib, pkgs, ... }: let
+
+    name = "minecraft";
+
+    in {
+
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
+        config = {
+
+            networking.firewall.allowedTCPPorts = [ 25565 ];
+            networking.firewall.allowedUDPPorts = [ 25565 ];
+
+            virtualisation.oci-containers.containers.minecraft = {
+                image = "itzg/minecraft-server:java21";
+
+# unstable, waiting for 26.05
+#pull = "newer";
+
+                hostname = "${name}.esotericbytes.com";
+
+                networks = [
+                    "docker-main"
+                ];
+
+                ports = [
+                    "25565:25565"
+                ];
+
+                volumes = [
+                    "/etc/minecraft/data:/data"
+                    "/etc/minecraft/mods:/mods"
+                ];
+
+                labels = {
+                };
+
+                extraOptions = lib.mkMerge [
+                    [ "--ip=192.168.101.27" ]
+                ];
+
+                environment = {
+                    EULA = "TRUE";
+                    TYPE = "NEOFORGE";
+                    VERSION = "1.21.1";
+                    NEOFORGE_VERSION = "latest";
+
+                    MOTD = "Guess who is back?";
+                    DIFFICULTY = "normal";
+
+                    MEMORY = "8G";
+
+                    ALLOW_FLIGHT = "true";
+
+                    #ENABLE_WHITELIST = "false";
+                    #WHITELIST = "";
+                };
+            };
+
+            systemd.services."docker-minecraft" = {
+                serviceConfig = {
+                    Restart = lib.mkOverride 90 "always";
+                    RestartMaxDelaySec = lib.mkOverride 90 "1m";
+                    RestartSec = lib.mkOverride 90 "100ms";
+                    RestartSteps = lib.mkOverride 90 9;
+                };
+                after = [
+                    "docker-network-setup.service"
+                ];
+                requires = [
+                    "docker-network-setup.service"
+                ];
+                partOf = [
+                    "docker-compose-minecraft-root.target"
+                ];
+                wantedBy = [
+                    "docker-compose-minecraft-root.target"
+                ];
+            };
+
+            systemd.targets."docker-compose-minecraft-root" = {
+                wantedBy = [ "multi-user.target" ];
+            };
+
+        };
+    };
+}
--- a/modules/features/n8n.nix
+++ b/modules/features/n8n.nix
@@ -38,15 +38,12 @@
                    "traefik.http.services.${name}.loadbalancer.server.port" = "5678";
                };

-                ports = [
-                ];
-
                extraOptions = [
                    "--ip=192.168.101.14"
                ];

                volumes = [
-                    "vol_n8n:/etc/n8n"
+                    "/etc/n8n:/home/node/.n8n"
                ];

                environment = {
@@ -61,6 +58,8 @@
                    N8N_DIAGNOSTICS_CONFIG_BACKEND = "";

                    N8N_SECURE_COOKIE = "false";
+
+                    N8N_RUNNERS_ENABLED = "true";
                };
            };

@@ -73,11 +72,9 @@
                };
                after = [
                    "docker-network-setup.service"
-                        "docker-volume-n8n.service" 
                ];
                requires = [
                    "docker-network-setup.service"
-                        "docker-volume-n8n.service" 
                ];
                partOf = [
                    "docker-compose-n8n-root.target"
@@ -86,20 +83,6 @@
                    "docker-compose-n8n-root.target"
                ];
            };
-
-            systemd.services."docker-volume-n8n" = {
-                path = [ pkgs.docker ];
-                serviceConfig = {
-                    Type = "oneshot";
-                    RemainAfterExit = true;
-                };
-                script = ''
-                    docker volume inspect vol_n8n || docker volume create vol_n8n --driver=local
-                    '';
-                partOf = [ "docker-compose-n8n-root.target" ];
-                wantedBy = [ "docker-compose-n8n-root.target" ];
-            };
-
        };
    };
 }
--- a/modules/features/netbird/netbird.nix
+++ b/modules/features/netbird/netbird.nix
@@ -51,6 +51,12 @@
                    hardened = false;
                };

+                ui = {
+                    enable = lib.mkDefault config.hardware.graphics.enable;
+                    #package = pkgs-us.netbird-ui;
+                    #package = pkgs.netbird-ui;
+                };
+
                package = pkgs-us.netbird;
                #package =   pkgs.netbird;
            };
--- a/modules/features/nginx.nix
+++ b/modules/features/nginx.nix
@@ -4,38 +4,79 @@

        config = {

-            containers.esotericbytes-com = {
+            environment.etc."nginx/nginx.conf".text = ''
+                events {
+                }
+                http {
+                    server {
+                        root /var/www/data;
+                    }
+                }
+            '';

-                autoStart = true;
-                privateNetwork = true;
-                hostAddress = "192.168.100.10";
-                localAddress = "192.168.100.13";
+            virtualisation.oci-containers.containers.nginx = {
+                image = "nginx:latest";

-                bindMounts = {
-                    "/var/www/data" = {
-                        hostPath = "/ssd1/esotericbytes-com/data";
-                        isReadOnly = false;
-                    };
+# unstable, waiting for 26.05
+#pull = "newer";
+
+                hostname = "esotericbytes.com";
+
+                networks = [
+                    "docker-main"
+                ];
+
+                volumes = [
+                    "/ssd1/esotericbytes-com/data:/var/www/data"
+                    "/etc/nginx/nginx.conf:/etc/nginx/nginx.conf"
+                ];
+
+                labels = {
+                    "traefik.enable" = "true";
+                    "traefik.http.routers.homepage.entrypoints" = "websecure,localsecure";
+                    "traefik.http.routers.homepage.rule" = "Host(`esotericbytes.com`) || Host(`www.esotericbytes.com`)";
+                    "traefik.http.routers.homepage.service" = "homepage";
+                    "traefik.http.routers.homepage.tls.certResolver" = "cloudflare";
+
+                    #"traefik.http.routers.homepage.middlewares" = "authentik@docker";
+
+                    "traefik.http.services.homepage.loadbalancer.server.port" = "80";
                };

-                config = {
+                extraOptions = lib.mkMerge [
+                    [ "--ip=192.168.101.28" ]
+                ];

-                    services.nginx = {
-                        enable = true;
-                        virtualHosts = {
-                            "esotericbytes.com" = {
-                                enableACME = false;
-                                forceSSL = false;
-                                root = "/var/www/data";
-                            };
-                        };
-                    };
-
-                    networking.firewall.allowedTCPPorts = [ 80 ];
-
-                    system.stateVersion = "24.05";
+                environment = {
                };
            };
+
+            systemd.services."docker-nginx" = {
+                serviceConfig = {
+                    Restart = lib.mkOverride 90 "always";
+                    RestartMaxDelaySec = lib.mkOverride 90 "1m";
+                    RestartSec = lib.mkOverride 90 "100ms";
+                    RestartSteps = lib.mkOverride 90 9;
+                };
+                after = [
+                    "docker-network-setup.service"
+                ];
+                requires = [
+                    "docker-network-setup.service"
+                ];
+                partOf = [
+                    "docker-compose-nginx-root.target"
+                ];
+                wantedBy = [
+                    "docker-compose-nginx-root.target"
+                ];
+            };
+
+            systemd.targets."docker-compose-nginx-root" = {
+                wantedBy = [ "multi-user.target" ];
+            };
+
+
        };
    };
 }
--- a/modules/features/odysseus.nix
+++ b/modules/features/odysseus.nix
@@ -0,0 +1,62 @@
+{ self, inputs, ... }: {
+
+    flake.nixosModules.odysseus = { config, lib, pkgs, ... }: let
+
+    subdomain = "odysseus";
+
+    name = "odysseus";
+
+    in {
+
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
+        config = {
+
+            virtualisation.oci-containers.containers.odysseus = {
+                image = "odysseus:latest";
+
+                imageFile = pkgs.dockertools.buildImage {
+                    name = "odysseus";
+
+                    tag = "latest";
+
+                    fromImage = "";
+                };
+
+                pull = "never";
+
+                hostname = "${subdomain}.esotericbytes.com";
+
+                networks = [
+                    "docker-main"
+                ];
+
+                volumes = [
+                    "vol_odysseus:/etc/odysseus"
+                ];
+
+                labels = {
+                    "traefik.enable" = "true";
+                    "traefik.http.routers.${name}.entrypoints" = "localsecure";
+                    "traefik.http.routers.${name}.rule" = "Host(`${subdomain}.esotericbytes.com`)";
+                    "traefik.http.routers.${name}.service" = "${name}";
+                    "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";
+
+#"traefik.http.services.odysseus.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
+                    "traefik.http.services.${name}.loadbalancer.server.port" = "7000";
+                };
+
+                extraOptions = [
+                    "--ip=192.168.101.29"
+                ];
+
+                environment = {
+                };
+            };
+        };
+    };
+}
+
--- a/modules/features/ollama.nix
+++ b/modules/features/ollama.nix
@@ -40,16 +40,6 @@
                ollama
            ];

-            networking.firewall.interfaces = {
-                "ve-traefik" = {
-                    allowedTCPPorts = [ hostPort ];
-                };
-
-                "ve-openwebui" = {
-                    allowedTCPPorts = [ hostPort ];
-                };
-            };
-
            virtualisation.oci-containers.containers.ollama = {
                image = "ollama/ollama:latest";

@@ -63,7 +53,7 @@
                ];

                ports = [
-                    "${builtins.toString hostPort}:11434"
+                    "127.0.0.1:${builtins.toString hostPort}:11434"
                ];

                volumes = [
--- a/modules/features/openwebui.nix
+++ b/modules/features/openwebui.nix
@@ -27,10 +27,6 @@
                    "docker-main"
                ];

-                /*ports = [
-                  "${builtins.toString hostPort}:8080"
-                  ];*/
-
                volumes = [
                    "vol_openwebui:/app/backend/data"
                ];
--- a/modules/features/pihole.nix
+++ b/modules/features/pihole.nix
@@ -19,6 +19,8 @@

            virtualisation.docker.daemon.settings.dns = [ "192.168.101.12" ];

+            networking.resolvconf.enable = lib.mkForce false;
+
            environment.etc."resolv.conf" = {
                enable = true;
                text = ''
@@ -32,12 +34,6 @@
                mode = "0664";
            };

-            networking.firewall.interfaces = {
-                "ve-traefik" = {
-                    allowedTCPPorts = [ hostPort ];
-                };
-            };
-
            virtualisation.oci-containers.containers.pihole = {
                image = "pihole/pihole:latest";

@@ -66,9 +62,9 @@
                ];

                ports = [
-                    "${builtins.toString hostPort}:80"
-                        "127.0.0.1:53:53/tcp"
-                        "127.0.0.1:53:53/udp"
+                    "127.0.0.1:${builtins.toString hostPort}:80"
+                    "127.0.0.1:53:53/tcp"
+                    "127.0.0.1:53:53/udp"
                ];

                volumes = [
--- a/modules/features/portainer.nix
+++ b/modules/features/portainer.nix
@@ -17,12 +17,6 @@

        config = {

-            networking.firewall.interfaces = {
-                "ve-traefik" = {
-                    allowedTCPPorts = [ hostPort ];
-                };
-            };
-
            virtualisation.oci-containers.containers.portainer = {
                image = "portainer/portainer-ce:latest";

@@ -48,7 +42,7 @@

                ports = [
                    "127.0.0.1:8000:8000"
-                        "${builtins.toString hostPort}:9000"
+                    "127.0.0.1:${builtins.toString hostPort}:9000"
                ];

                extraOptions = [
--- a/modules/features/searxng/searxng.nix
+++ b/modules/features/searxng/searxng.nix
@@ -40,9 +40,6 @@
                    "traefik.http.services.${name}.loadbalancer.server.port" = "8080";
                };

-                ports = [
-                ];
-
                extraOptions = [
                    "--ip=192.168.101.9"
                ];
--- a/modules/features/traefik/config/routing.yml
+++ b/modules/features/traefik/config/routing.yml
@@ -1,17 +1,6 @@
 http: 
  routers: 
    
-    homepageSecure: 
-      entryPoints: 
-        - "websecure" 
-        - "localsecure"
-      rule: "Host(`esotericbytes.com`) || Host(`www.esotericbytes.com`)"
-      service: "homepage"
-      middlewares:
-        - authentik@docker
-      tls:
-        certResolver: "cloudflare"
-    
    code-server: 
      entryPoints: 
        - "localsecure"
@@ -30,11 +19,6 @@ http:
        certResolver: "cloudflare"

  services: 
-    homepage:
-      loadBalancer:
-        servers: 
-          - url: "http://192.168.100.13:80"
-      
    code-server:
      loadBalancer:
        servers: 
--- a/modules/features/traefik/traefik.nix
+++ b/modules/features/traefik/traefik.nix
@@ -9,7 +9,7 @@

        config = {

-            networking.firewall.allowedTCPPorts = [ 80 81 443 444 2222 ];
+            networking.firewall.allowedTCPPorts = [ 80 443 2222 ];

            sops.secrets = {
                "traefik/cf_email" = {};
@@ -58,11 +58,11 @@
                ];

                ports = [
-                    "80:80"
-                        "81:81"
-                        "443:443"
-                        "444:444"
-                        "2222:2222"
+                    #"80:80"
+                    "80:81"
+                    #"443:443"
+                    "443:444"
+                    "2222:2222"
                ];

                labels = {
--- a/modules/hosts/homebox/configuration.nix
+++ b/modules/hosts/homebox/configuration.nix
@@ -35,6 +35,7 @@
                wyoming
                virtual-machines

+                minecraft
            ];

        config = {
@@ -52,7 +53,7 @@

            users.users.root.openssh.authorizedKeys.keys = [
                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop"
-                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnUhN2uHwAJF/SLRX3wlGRmfhV3zpP88JQAYB+gh8jW nathan@localhost"
+                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnUhN2uHwAJF/SLRX3wlGRmfhV3zpP88JQAYB+gh8jW nathan@localhost"
            ];

            programs.zsh.enable = true;
@@ -68,17 +69,48 @@
                networkmanager = {
                    enable = true;
                    dns = "none";
+                    unmanaged = [ "enp6s0" ];
                };
                useDHCP = false;
                dhcpcd.enable = false;

                nftables = {};
+
+                interfaces."enp6s0" = {
+                    ipv4.addresses = [{ address = "192.168.121.1"; prefixLength = 24; }];
+                };
+
                nat = {
                    enable = true;
-                    internalInterfaces = [ "ve-.+" ];
+                    internalInterfaces = [ "ve-.+" "enp6s0" "virbr0" ];
                    externalInterface = "wlp7s0"; # wifi
 #externalInterface = "enp6s0"; # ethernet
                };
+                
+                firewall.interfaces."enp6s0" = {
+                    allowedUDPPorts = [ 53 67 68 ];
+                    allowedTCPPorts = [ 53 67 68 ];
+                };
+            };
+
+            services.dnsmasq = {
+                enable = true;
+                settings = {
+                    port = 0;
+                    interface = "enp6s0";
+                    dhcp-range = [ "192.168.121.2,192.168.121.254,1h" ];
+                    bind-interfaces = true;
+                };
+            };
+
+            specialisation = {
+                desktop = {
+                    configuration = with self.nixosModules; lib.mkMerge [
+                        aurora-greeter
+                        steam
+                        hyprland
+                    ];
+                };
            };

            sops.secrets."netbirdKey".sopsFile = lib.mkForce ./secrets.yaml;
--- a/modules/hosts/laptop/configuration.nix
+++ b/modules/hosts/laptop/configuration.nix
@@ -84,8 +84,6 @@
                    enable = true;
                    #dns = "none";
                };
-                useDHCP = false;
-                dhcpcd.enable = false;
            };

            services.openssh.openFirewall = false;
@@ -96,6 +94,12 @@
                        ethdhcp
                    ];
                };
+
+                hotspot = {
+                    configuration = with self.nixosModules; lib.mkMerge [
+                        hotspot
+                    ];
+                };
            };


--- a/modules/hosts/z2w/core.nix
+++ b/modules/hosts/z2w/core.nix
@@ -24,8 +24,48 @@
            networking = {
                hostName = lib.mkDefault "z2w";
                nameservers = [ "1.1.1.1" "1.0.0.1" ];
-                #networkmanager.enable = true;
-                #wireless.enable = lib.mkForce false;
+                /*networkmanager = {
+                    enable = true;
+
+                    ensureProfiles.profiles = {
+                        laptop = {
+                            connection = {
+                                id = "laptop";
+                                permissions = "";
+                                type = "wifi";
+                            };
+                            ipv4 = {
+                                dns-search = "";
+                                method = "auto";
+                            };
+                            ipv6 = {
+                                addr-gen-mode = "stable-privacy";
+                                dns-search = "";
+                                method = "auto";
+                            };
+                            wifi = {
+                                mac-address-blacklist = "";
+                                mode = "infrastructure";
+                                ssid = "laptopHotspot";
+                            };
+                            wifi-security = {
+                                auth-alg = "open";
+                                key-mgmt = "wpa-psk";
+                                psk = "//falconAdjacent42";
+                            };
+                        };
+                    };
+                };
+                wireless.enable = lib.mkForce false;*/
+                
+                wireless = {
+                    enable = true;
+
+                    networks.laptop = {
+                        ssid = "laptopHotspot";
+                        psk = "//falconAdjacent42";
+                    };
+                };
            };


--- a/modules/users/nathan/home-manager/default.nix
+++ b/modules/users/nathan/home-manager/default.nix
@@ -36,6 +36,8 @@
                theme.package = pkgs.tokyonight-gtk-theme;
                iconTheme.package = pkgs.rose-pine-icon-theme;
                iconTheme.name = "rose-pine-moon";
+
+                gtk4.theme = config.gtk.theme;
            };

            services.mpris-proxy.enable = true;
--- a/modules/users/nathan/home-manager/dotfiles/hypr/dwindle.conf
+++ b/modules/users/nathan/home-manager/dotfiles/hypr/dwindle.conf
@@ -1,6 +1,5 @@
 dwindle {
 	# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-        pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
        preserve_split = yes # you probably want this
 }

--- a/modules/users/nathan/home-manager/features/firefox.nix
+++ b/modules/users/nathan/home-manager/features/firefox.nix
@@ -24,6 +24,8 @@
                enable = true;
                package = pkgs.firefox;

+                configPath = "${config.xdg.configHome}/mozilla/firefox";
+
                profiles.nathan = {
                    search = {
                        default = "ddg";
--- a/modules/users/nathan/home-manager/features/opencode.nix
+++ b/modules/users/nathan/home-manager/features/opencode.nix
@@ -6,9 +6,10 @@

            programs.opencode = {
                enable = true;
+                
+                tui.theme = "system";

                settings = {
-                    theme = "system";
                    model = "ollama-remote/qwen3:8b";

                    provider = {
--- a/modules/users/nathan/home-manager/features/packages.nix
+++ b/modules/users/nathan/home-manager/features/packages.nix
@@ -43,8 +43,7 @@
         grim
         slurp
         wl-clipboard
-         xfce.thunar
-         blueberry
+         thunar
         brightnessctl
         libdbusmenu-gtk3
         ];
--- a/modules/users/nathan/home-manager/features/ssh.nix
+++ b/modules/users/nathan/home-manager/features/ssh.nix
@@ -6,7 +6,7 @@
            enable = true;

            enableDefaultConfig = false;
-
+/*
            matchBlocks = {

                "*" = {
@@ -29,6 +29,36 @@
                    port = 22;
                };

+                "remote" = {
+                    hostname = "esotericbytes.com";
+                    user = "nathan";
+                    identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
+                    port = 22;
+                };
+            };
+*/
+            settings = {
+
+                "*" = {
+                    forwardAgent = false;
+                    addKeysToAgent = "no";
+                    compression = false;
+                    serverAliveInterval = 0;
+                    serverAliveCountMax = 3;
+                    hashKnownHosts = false;
+                    userKnownHostsFile = "~/.ssh/known_hosts";
+                    controlMaster = "no";
+                    controlPath = "~/.ssh/master-%r@%n:%p";
+                    controlPersist = "no";
+                };
+
+                "builder" = {
+                    hostname = "esotericbytes.com";
+                    user = "remote-builder";
+                    identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
+                    port = 22;
+                };
+
                "remote" = {
                    hostname = "esotericbytes.com";
                    user = "nathan";
--- a/modules/users/nathan/home-manager/features/yazi.nix
+++ b/modules/users/nathan/home-manager/features/yazi.nix
@@ -4,6 +4,7 @@
        config = {
            programs.yazi = {
                enable = true;
+                shellWrapperName = "y";
            };
        };
    };
--- a/modules/users/nathan/nathan.nix
+++ b/modules/users/nathan/nathan.nix
@@ -7,6 +7,7 @@
        pi4 = [ "pi4" ];
        z2w = [ "red-black" "blue-white" "z2w" ];
        useWith = x: y: (lib.mkIf (builtins.any (z: z == config.networking.hostName) x) y);
+        useWithGraphical = x: y: (lib.mkIf (builtins.any (z: z == config.networking.hostName && config.hardware.graphics.enable) x) y);
    in {
        
        config = {
@@ -49,17 +50,17 @@

            home-manager.users.nathan = with self.homeModules; lib.mkMerge [
                self.homeModules.nathan
-                (useWith (laptop ++ iso) nathan-aurora)
-                (useWith (laptop ++ iso) nathan-firefox)
-                (useWith (laptop ++ iso) nathan-rofi)
-                (useWith (laptop ++ iso) nathan-hypridle)
-                (useWith (laptop ++ iso) nathan-hyprland)
-                (useWith (laptop ++ iso) nathan-kitty)
-                (useWith (laptop ++ iso) nathan-scripts)
-                (useWith (laptop ++ iso) nathan-pywal)
+                (useWithGraphical (laptop ++ homebox ++ iso) nathan-aurora)
+                (useWithGraphical (laptop ++ homebox ++ iso) nathan-firefox)
+                (useWithGraphical (laptop ++ homebox ++ iso) nathan-rofi)
+                (useWithGraphical (laptop ++ iso) nathan-hypridle)
+                (useWithGraphical (laptop ++ homebox ++ iso) nathan-hyprland)
+                (useWithGraphical (laptop ++ homebox ++ iso) nathan-kitty)
+                (useWithGraphical (laptop ++ homebox ++ iso) nathan-scripts)
+                (useWithGraphical (laptop ++ homebox ++ iso) nathan-pywal)
                (useWith (laptop ++ homebox) nathan-sops)
                
-                (useWith laptop {
+                (useWithGraphical laptop {
                    wayland.windowManager.hyprland.extraConfig = ''
                        monitor=eDP-1,1920x1080@60,0x0,1
                        bind = CTRL SHIFT, XF86Launch2, exec, bash -c 'if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then pkexec --user root /nix/var/nix/profiles/system/bin/switch-to-configuration switch; else pkexec --user root /nix/var/nix/profiles/system/specialisation/docked/bin/switch-to-configuration switch; fi'
@@ -67,17 +68,24 @@
                    '';
                })

-                (useWith (iso) {
+                (useWithGraphical (iso ++ homebox) {

                    wayland.windowManager.hyprland.extraConfig = ''
                        monitor=,preferred,auto,1
                    '';
                })

+                (useWithGraphical (homebox) {
+
+                    olympus = {
+                        packageSet = lib.mkForce "full";
+                    };
+                })
+
                (useWith (iso ++ pi4 ++ z2w ++ homebox) {

                    olympus = {
-                        packageSet = "minimal";
+                        packageSet = lib.mkDefault "minimal";
                    };
                })
            ];
Author	SHA1	Message	Date
Nathan	40d3d89aa2	nixos 26.05	2026-06-01 20:42:33 -05:00
Nathan	d2dc74cd86	nixos 26.05	2026-06-01 20:19:50 -05:00
Nathan	ffef916b3d	nixos 26.05	2026-06-01 20:18:41 -05:00
Nathan	30fcac6172	nixos 26.05	2026-06-01 19:55:01 -05:00
Nathan	70cb5dba81	nixos 26.05	2026-06-01 19:51:17 -05:00
Nathan	e25b717811	nixos 26.05	2026-06-01 19:43:41 -05:00
Nathan	81b145d426	nixos 26.05	2026-06-01 19:42:31 -05:00
Nathan	de7f1c7f21	fix virt manager	2026-05-16 13:45:20 -05:00
Nathan	7c34325e4c	fix dnsmasq	2026-05-16 13:02:25 -05:00
Nathan	75da846be1	dhcp for homebox eth	2026-05-14 13:45:10 -05:00
Nathan	c5f2f55a8b	dhcp for homebox eth	2026-05-14 13:42:31 -05:00
Nathan	40e31fdd15	desktop for homebox	2026-05-14 12:44:58 -05:00
Nathan	57df8775c9	desktop for homebox	2026-05-14 12:42:08 -05:00
Nathan	ee314f20b7	improve security	2026-05-13 11:31:08 -05:00
Nathan	7456229c63	improve security	2026-05-13 11:27:28 -05:00
Nathan	72cd269e26	improve security	2026-05-13 11:18:53 -05:00
Nathan	8b10030515	improve security	2026-05-13 11:09:12 -05:00
Nathan	d9420184a1	improve security	2026-05-13 10:50:14 -05:00
Nathan	960a5d9c3b	improve security	2026-05-13 10:31:19 -05:00
Nathan	40dd4c9e9b	improve security	2026-05-13 10:26:05 -05:00
Nathan	53aac1d212	improve security	2026-05-13 10:16:05 -05:00
Nathan	5e452983be	improve security	2026-05-13 10:09:01 -05:00
Nathan	576cb9d3e8	improve security	2026-05-13 10:04:01 -05:00
Nathan	5f7c219838	improve security	2026-05-13 09:58:58 -05:00
Nathan	d3eeb70fde	allow flight	2026-04-30 22:15:33 -05:00
Nathan	eb0fb0b3db	docker minecraft	2026-04-28 18:07:18 -05:00
Nathan	3aee709621	docker minecraft	2026-04-28 16:48:16 -05:00
Nathan	7765a55a80	docker nginx	2026-04-28 14:11:16 -05:00
Nathan	056b0a5f85	docker nginx	2026-04-28 14:09:06 -05:00
Nathan	fa5ac5d5cd	docker nginx	2026-04-28 14:04:39 -05:00
Nathan	8dfe22adfe	docker nginx	2026-04-28 14:02:02 -05:00
Nathan	1895311639	docker nginx	2026-04-28 13:59:30 -05:00
Nathan	2ad3ecb88c	docker nginx	2026-04-28 13:55:56 -05:00
Nathan	4f9bc1b04c	docker nginx	2026-04-28 13:35:37 -05:00
Nathan	e6e3caee3c	fix n8n	2026-04-27 23:29:54 -05:00
Nathan	4bae45819d	fix n8n	2026-04-27 23:18:14 -05:00
Nathan	f72e486105	fix n8n	2026-04-27 23:12:59 -05:00
Nathan	06925492ac	minecraft server	2026-04-27 17:31:08 -05:00
Nathan	f25ac642db	minecraft server	2026-04-27 17:30:21 -05:00
Nathan	c24c7a1422	hotspot	2026-04-27 01:05:37 -05:00
Nathan	3ee8674c79	hotspot	2026-04-26 23:33:17 -05:00
Nathan	47d4a2ff07	hotspot	2026-04-26 23:31:19 -05:00
Nathan	0a76abcc54	firmware size	2026-04-26 21:14:54 -05:00
Nathan	56a963d760	gitea	2026-04-26 13:47:47 -05:00
Nathan	4cbfd60d3a	update inputs	2026-04-26 13:06:43 -05:00
Nathan	825b466468	test gitea docker	2026-04-26 12:33:46 -05:00
Nathan	1cd7cd2629	test gitea docker	2026-04-26 12:28:11 -05:00