WIP: add home-assistant proxy to router

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760130406,
+        "lastModified": 1750650909,
-        "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=",
+        "narHash": "sha256-HRNJuqo15PRKezyBjhNf2Tjj05EcSJ8q6xJyDDbmDXE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d305eece827a3fe317a2d70138f53feccaf890a1",
+        "rev": "520fc4b50af1b365014c3748c126d3f52edb2f3b",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751903740,
+        "lastModified": 1747663185,
-        "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
+        "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "032decf9db65efed428afd2fa39d80f7089085eb",
+        "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760038930,
+        "lastModified": 1750506804,
-        "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
+        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
+        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759321049,
+        "lastModified": 1748196248,
-        "narHash": "sha256-8XkU4gIrLT2DJZWQyvsP5woXGZF5eE/7AnKfwQkiwYU=",
+        "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "205dcfd4a30d4a5d1b4f28defee69daa7c7252cd",
+        "rev": "b7697abe89967839b273a863a3805345ea54ab56",
         "type": "github"
       },
       "original": {
@@ -111,11 +111,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753137768,
+        "lastModified": 1746643487,
-        "narHash": "sha256-bCQ8IHak1hF38amAgz2YKIEwteU5eAkgoC0fwfoRxO0=",
+        "narHash": "sha256-dcB/DArJObCvqE/ZEdQSDW2BZMeDyF83Se5KPfJvz60=",
         "owner": "Platonic-Systems",
         "repo": "secrix",
-        "rev": "f783b038ee639a589affcf3c612187dafcfa0476",
+        "rev": "4c64203fa5b377953b1fb6d5388187df8b60c6d5",
         "type": "github"
       },
       "original": {

flake.nix

@@ -31,7 +31,7 @@
 
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
-      home-manager.sharedModules = [ plasma-manager.homeModules.plasma-manager ];
+      home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
 
       home-manager.users.cazzzer = import file;
       # Optionally, use home-manager.extraSpecialArgs to pass

hosts/Yura-PC/hardware-configuration.nix

@@ -18,11 +18,6 @@
       fsType = "zfs";
     };
 
-  fileSystems."/nix" =
-    { device = "zroot/data/nix";
-      fsType = "zfs";
-    };
-
   fileSystems."/boot" =
     { device = "/dev/disk/by-uuid/970C-6A15";
       fsType = "vfat";

hosts/common-desktop.nix

@@ -7,7 +7,7 @@
     "sysrq_always_enabled=1"
   ];
 
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_16;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_14;
   boot.loader = {
     efi.canTouchEfiVariables = true;
     timeout = 3;
@@ -24,9 +24,6 @@
 
   # Enable networking
   networking.networkmanager.enable = true;
-  networking.networkmanager.plugins = [
-    pkgs.networkmanager-openvpn
-  ];
 
   # Enable the X11 windowing system.
   # You can disable this if you're only using the Wayland session.
@@ -61,7 +58,7 @@
   programs.git.enable = true;
   programs.git.lfs.enable = true;
   # https://nixos.wiki/wiki/Git
-  programs.git.package = pkgs.git.override { withLibsecret = true; doInstallCheck = false; };
+  programs.git.package = pkgs.git.override { withLibsecret = true; };
   programs.lazygit.enable = true;
   programs.neovim.enable = true;
   programs.wireshark.enable = true;
@@ -110,7 +107,6 @@
     jq
     ldns
     mediainfo
-    powertop
     rbw
     restic
     resticprofile
@@ -145,7 +141,6 @@
     android-studio
     rustup
     zed-editor
-    package-version-server # for zed
   ] ++ [
     # Python
     python3
@@ -168,8 +163,5 @@
     # Gleam
     gleam
     beamMinimal26Packages.erlang
-    
-    # Racket
-    racket
   ];
 }

modules/opts/kb-input/default.nix

@@ -45,7 +45,7 @@ in {
       enable = true;
       type = "fcitx5";
       fcitx5.waylandFrontend = true;
-      # fcitx5.plasma6Support = true;
+      fcitx5.plasma6Support = true;
       fcitx5.addons = [ pkgs.fcitx5-mozc ];
     };
   };

modules/router/default.nix

@@ -76,7 +76,6 @@ in
     starship
     tealdeer
     transcrypt
-    wakeonlan
     waypipe
     whois
     wireguard-tools

modules/router/dns.nix

@@ -87,7 +87,6 @@ in
 
       # Allowed exceptions
       "@@||googleads.g.doubleclick.net"
-      "@@||stats.grafana.org"
     ]
       # Alpina DNS rewrites
       ++ map (host: "${host}${domain}^$dnsrewrite=debbi.${sysdomain}") alpinaDomains;

modules/router/firewall.nix

@@ -56,12 +56,6 @@ in
               udp . 45608 : ${vars.extra.opnsense.addr4} . 45608,
               udp . 35848 : ${vars.extra.opnsense.addr4} . 35848,
               udp . 48425 : ${vars.extra.opnsense.addr4} . 48425,
-              # Amnezia VPN server
-              udp . 37138 : ${vars.extra.amnezia.addr4} . 37138,
-              # Minecruft server
-              tcp . 25565 : ${vars.extra.minecruft.addr4} . 25565,
-              udp . 25565 : ${vars.extra.minecruft.addr4} . 25565,
-              udp . 24454 : ${vars.extra.minecruft.addr4} . 24454,
           }
       }
 

modules/router/services.nix

@@ -58,7 +58,7 @@ in
     enable = true;
     package = pkgs.caddy.withPlugins {
       plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-      hash = "sha256-XwZ0Hkeh2FpQL/fInaSq+/3rCLmQRVvwBM0Y1G1FZNU=";
+      hash = "sha256-Gsuo+ripJSgKSYOM9/yl6Kt/6BFCA6BuTDvPdteinAI=";
     };
     virtualHosts."*.${domain}".extraConfig = ''
       encode

modules/router/vars.nix

@@ -135,7 +135,5 @@ rec {
         }
       ];
     };
-    amnezia.addr4 = "${ifs.lan10.p4}.31";
-    minecruft.addr4 = "${ifs.lan.p4}.11";
   };
 }