diff --git a/flake.lock b/flake.lock index d90d484..6daa6a9 100644 --- a/flake.lock +++ b/flake.lock @@ -143,11 +143,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", + "lastModified": 1676300157, + "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", + "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", "type": "github" }, "original": { diff --git a/garnix.yaml b/garnix.yaml index 2a5ab86..5d39710 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -4,7 +4,7 @@ builds: - nixosConfigurations.* - defaultPackage.x86_64-linux - homeConfigurations.x86_64-gui - - homeConfigurations.x86_64-nogui + - homeConfigurations.x86_64-nogui.activationPackage - darwinConfigurations.* exclude: - nixosConfigurations.linode # Requires decrypted files diff --git a/home/gui/chat.nix b/home/gui/chat.nix index d53ffe5..913e0e0 100644 --- a/home/gui/chat.nix +++ b/home/gui/chat.nix @@ -3,6 +3,7 @@ let darwinPkgs = []; x86Pkgs = with pkgs; [ + discord element-desktop slack ]; diff --git a/hosts/2maccabees/dnsmasq.nix b/hosts/2maccabees/dnsmasq.nix index 8d02617..578cab0 100644 --- a/hosts/2maccabees/dnsmasq.nix +++ b/hosts/2maccabees/dnsmasq.nix @@ -21,25 +21,6 @@ let ]; extraConfig = builtins.concatStringsSep "\n" [ - "expand-hosts" - "domain=thehellings.lan" - "log-dhcp" - "log-queries" - "addn-hosts=/etc/adblock_hosts" - -# "dhcp-range=eth0,10.42.0.1,10.42.1.255,255.255.0.0,static" - "dhcp-range=eth0,10.42.2.1,10.42.2.255,255.255.0.0,12h" - "dhcp-option=eth0,option:router,10.42.1.1" - "dhcp-option=eth0,option:dns-server,10.42.1.2,1.1.1.1" - "dhcp-option=eth0,option:domain-search,thehellings.lan" - - "dhcp-range=vlan66@eth0,192.168.66.3,192.168.66.150,255.255.255.0,12h" - "dhcp-option=vlan66@eth0,option:router,192.168.66.1" - "dhcp-option=vlan66@eth0,option:dns-server,192.168.66.2" - - "dhcp-range=vlan67@eth0,192.168.67.3,192.168.67.150,12h" - "dhcp-option=vlan67@eth0,option:router,192.168.67.1" - "dhcp-option=vlan67@eth0,option:dns-server,192.168.67.2" ]; in { @@ -47,10 +28,34 @@ in services.dnsmasq = { enable = true; # Public AdGuard DNS servers - servers = [ - "94.140.14.14" - "94.140.15.15" - ]; + settings = { + domain = "thehellings.lan"; + dhcp-range = [ + # "eth0,10.42.0.1,10.42.1.255,255.255.0.0,static" + "eth0,10.42.2.1,10.42.2.255,255.255.0.0,12h" + "vlan66@eth0,192.168.66.3,192.168.66.150,255.255.255.0,12h" + "vlan67@eth0,192.168.67.3,192.168.67.150,12h" + ]; + dhcp-option = [ + "eth0,option:router,10.42.1.1" + "eth0,option:dns-server,10.42.1.2,1.1.1.1" + "eth0,option:domain-search,thehellings.lan" + + "vlan66@eth0,option:router,192.168.66.1" + "vlan66@eth0,option:dns-server,192.168.66.2" + + "vlan67@eth0,option:router,192.168.67.1" + "vlan67@eth0,option:dns-server,192.168.67.2" + ]; + expand-hosts = true; + log-dhcp = true; + log-queries = true; + addn-hosts = "/etc/adblock_hosts"; + server = [ + "94.140.14.14" + "94.140.15.15" + ]; + }; extraConfig = "${extraConfig}"; }; environment.systemPackages = [ pkgs.curl ]; diff --git a/hosts/2maccabees/home-assistant.nix b/hosts/2maccabees/home-assistant.nix index 7c1f2c2..50d4af0 100755 --- a/hosts/2maccabees/home-assistant.nix +++ b/hosts/2maccabees/home-assistant.nix @@ -17,6 +17,8 @@ in "eufy" "lovelace" "nextcloud" + "smart_meter_texas" + "solaredge" "tplink" "wiz" "zwave_js" diff --git a/hosts/linode/synapse.nix.crypt b/hosts/linode/synapse.nix.crypt index 62151fc..8649168 100644 --- a/hosts/linode/synapse.nix.crypt +++ b/hosts/linode/synapse.nix.crypt @@ -1,22 +1,41 @@ -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 diff --git a/modules-all/automatic/nix.nix b/modules-all/automatic/nix.nix index feb18e6..1026545 100644 --- a/modules-all/automatic/nix.nix +++ b/modules-all/automatic/nix.nix @@ -4,6 +4,17 @@ # Enable flakes nix = { package = pkgs.nixFlakes; + buildMachines = [ + { + hostName = "dns.me.ts"; + system = "aarch64-linux"; + } + + { + hostName = "jude.me.ts"; + system = "x86_64-linux"; + } + ]; settings = { experimental-features = "nix-command flakes"; diff --git a/modules-all/automatic/programs.nix b/modules-all/automatic/programs.nix index 59194ea..4c130b8 100644 --- a/modules-all/automatic/programs.nix +++ b/modules-all/automatic/programs.nix @@ -14,6 +14,7 @@ hms # My own home manager switcher home-manager htop + killall nano pwgen transcrypt diff --git a/modules-linux/automatic/syncthing.nix b/modules-linux/automatic/syncthing.nix index 1bd8471..1778dba 100644 --- a/modules-linux/automatic/syncthing.nix +++ b/modules-linux/automatic/syncthing.nix @@ -9,7 +9,7 @@ let in { services.syncthing = { - enable = true; + enable = false; user = "greg"; group = "users"; dataDir = "/home/greg/sync";