From d008848d52e2c519658acfff547d18ae90f51ade Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 1 Oct 2022 16:15:40 -0500 Subject: [PATCH 1/5] Update garnix.yaml Try building the activationPackage directly. --- garnix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f42fad1bdf5871f85a956997f9821326d5ba8fce Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sun, 22 Jan 2023 00:00:51 -0600 Subject: [PATCH 2/5] Desktop updates --- home/gui/chat.nix | 1 + hosts/linode/synapse.nix.crypt | 38 ++++++++++++++++----------- modules-all/automatic/nix.nix | 11 ++++++++ modules-linux/automatic/syncthing.nix | 2 +- 4 files changed, 35 insertions(+), 17 deletions(-) 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/linode/synapse.nix.crypt b/hosts/linode/synapse.nix.crypt index d9021cd..62151fc 100644 --- a/hosts/linode/synapse.nix.crypt +++ b/hosts/linode/synapse.nix.crypt @@ -1,16 +1,22 @@ -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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-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"; From 1c20d6ab4095c0de30a82e3b13423d948674f23b Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 15 Feb 2023 12:29:15 -0600 Subject: [PATCH 3/5] Blank commit? --- hosts/linode/synapse.nix.crypt | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/hosts/linode/synapse.nix.crypt b/hosts/linode/synapse.nix.crypt index d589708..d9021cd 100644 --- a/hosts/linode/synapse.nix.crypt +++ b/hosts/linode/synapse.nix.crypt @@ -1,12 +1,16 @@ -x6ns0UtbX6AcSBJfaW25BVEVRXmKdZW7bRPFJvCvkt/nWw/qZPwDzwOhORRooyJR -14MXmRGmL3nfhlnZahxblVrHkOwCje4ADrE/cNf4+V4AOMlnMbIwkH1a7y9jAsBF -LbiBgQ1NOE/TcLHwmnCByKO6VkZG03e53skydYITVa6uummPLcvZVeL97Cx+8gfy -QPXmyLFQ9DzR5vVDVkRIM1UK6eZWM5NyWdVoyhfiK4QP+KsPkmxsA3l/safrm8Qy -U3LlyXuk/wmfk9ZiPp1cWmruH4xdfaVbYPeGhAqRdwSdIgngpR2CJJVc7d/rve3l -86+9yM6TIH6EB09cmjvT+Luim8l/5qrG0eeK3d0iUGkrHRzLa/7VGnlxi8zZGn3m -9k4qyZjAPG27d5/4wp3KsLFWKpvjiNetpRDMpHYJfjptvYg7WrYxndeRIBLf7MJ7 -jN7oQhKJSQLR3QhIv5nH7T0wsKWIv4ua8jEPi+/sqdCvHN4kBiwpUHyRCuBO12+2 -EeuB8GnILRv0gh9hfQBnPVdv8A3grgfZElc3UkwharcrRIgBsb7a3I+4TbyQd9Bq -nVZgkl/5jRLd2SyRX68Ny1DYBzepH2nMh5v6Q6h+WFXsTC5INulitvLk1UUfnlvW -CbiJl1TsGlJwJLI53WS7lO/mUWe6KEIp33eqHgnaNTXWrCbq4jdqj5l6Im7B5ciz -WEbvkg+HFwOGLKdutk4fTyQucyPqEI/GP2uM9ZBLZKA= +x7fcaoUM3nYDlFoW+gcKfm9bkVaoftvoKrbrJm21OCR4tnrsWCey7tuN2DDvBnru +F54E4XT/TuU6cDg73FwXjQmkQo4lzP5USwwEHeXXz1w5s0fpfMiTT9TLlD47vCyQ +LeYHiILzav+UiJQmxORSXUbso/XKLKnhL486e6TMtsfLH7h0sziXPY5OAhIJd++3 +TiNZM+njgfQaPr9Ih1fuEbfH9/6PxIqMr2V4M/IQFqQ9FW4y8OMiiyk3wXcWzpBG +Y325MIboZHzLahgeHmnWJYJlpZQzjmsd9z3ApTgHdIELy2K2bgD1uS3qitFKqUpT +1y0ZBW0BRxsbBARHz+u132jG2Z+AcTOkKuk5oZYtatDP/V5kaemH3d1GZZUBrPHY +AXbfFP4Fswvdw8FxRX6QSZRmYBVfao1xwNEZf49QmabyxgZkuDzGPBxbfMiXETg/ +lw309msVld1QpHSVtn9aJIKmjkpNEReFoPyb0oRLUEZWb3ixVwulD9NpPijWhdZS +vg1JDtK3czt9mRX63hNYif/QEHIN0dlzNh90zuith2WMa4OWQM4E+j2d42KUjpJ9 +X+5zeu2v8LmzrI8X01SGj4eMWG0CvasrbHWkCL4S1kyL0Kx+izH8mP98w/XSgV5U +rOjkw8J40ExcTlWkNDPWnDXlxHzsl8s0DLHKE9MoucczJKXqcGQOQyZTdDDVY3ww +jdt48WvJyn7xFc4m0piorQyt+615kTL6Ac8AQJVSpep4hxLAdWMSTRpCDljA488X +z2Pz2nJG7OsPu3QUy959426hyYIaXSYovybwu8NSjhnKyaXhR98IAwYc92exW1JU +xaqpPCVSpDkbndEQ3hPTucursJUvWhVspXTV1P6egwW2UGwvmtiWYXwBoEx4zQZt +CDYgvJsa9tPbyQn88PgReJnAA6P+K9M3NQDFp62rVKcm5h465UlDDrXBPWLIwUrA +mrOsRqMWr9xmbHS2eI5Wt0C8+h1tj9ktGWbwaQ0orakMSHpNogXqIltsX8P4+VJU From eaa4ef076f0ab2d2aa47a0f982ebbef758ed18ba Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 16 Feb 2023 02:51:03 -0600 Subject: [PATCH 4/5] Update nixunstable Update dnsmasq to new format to avoid deprecation issues Add smart home energy modules to Home Assistant --- flake.lock | 6 ++-- hosts/2maccabees/dnsmasq.nix | 51 ++++++++++++++++------------- hosts/2maccabees/home-assistant.nix | 2 ++ 3 files changed, 33 insertions(+), 26 deletions(-) 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/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" From b35055bd8eadadc76b0699c1a78d78573c0d6e29 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sun, 19 Feb 2023 21:38:12 -0600 Subject: [PATCH 5/5] Add killall to installations --- modules-all/automatic/programs.nix | 1 + 1 file changed, 1 insertion(+) 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