From d008848d52e2c519658acfff547d18ae90f51ade Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 1 Oct 2022 16:15:40 -0500 Subject: [PATCH 1/4] 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 6a2ef7568f8052e227a933aaf850942ce2f8f960 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 20 Feb 2023 20:02:27 -0600 Subject: [PATCH 2/4] This crypt nonsense --- hosts/linode/synapse.nix.crypt | 38 ++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 16 deletions(-) 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 @@ -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 +rxVK/6jdQQiqx5ATBJJ+2Dq6COHswFM65UHtsRltJDeX/HDzl0pi4QxK2fSBrTKn +pyBAOxIrmw5iEELe008iXahv/EK26IGoWgiCUDYZE6a0sW+5rtBYbP7VDSBSSQ6b +ha9aA6w8jXVAsWKRsuTNrNZ9qeXeDj/gTng4sqnQSlBVpf2OWMmqhRSAoUUFbXa+ +gwG/RF/C5x6g7G0mZUpXuH+F57dj6GgCvQUVtLMrWgY9Hrc9M/quIZeMTcJ/W2Fm +oK3fuOqqQADcopM+uiIJzdu0aL+YMIodLU8WSjnLSc+u6oEwSxIcjfZYSClk+q7B +asudxFJtDS+XdVHscatV2wCWDqHJL002VeGugDtpyAzRr7Nq7zhDoTTP9WfFrvoD +uM+rdDm8nc4V1ovX0iblTLQ3CH0cOaylkJLqGFIBbA//3nMaW9tiUa1/u++D4gJP +iVAJuc3ThwzabUYtpnCmBphJIRzbCtuQbfV9xyPPSDTGRPeVyCgoA1+NoyPcJvOh +VGV+1C3UjZ2veXn9srkUyYHueJrFRpCnles2iRRvLn96Ndwi9wOuAo5hMMjN/iwW +kTXfDtmXr2VRrXnZWI7og6TCQwd2Mmz9L8hEhEKWhzqD57dn36T0X6wz6NSRrwPZ +Jwh6tDdAY5iBPlv/sUPa9bJfvJwl5OJ3p+G2ZsiT671sC9mSsWKwG2iYs8+RQT+l +7f4wrezThcp+YJSvTdUF7NMzyvpKf9ojaV/AaUlzUKzSTzssvk5sEDUWrcfk8LYW +UhzojVqawCdQbVD2RnYMxcOn4/HCvO4qdB4WEmYqWdgQgVB31mOHz5afIZR1jJXY +shLi/oUEkWktTBEl+tF6JutLLz5BXcM0rx4MMMifNOcIV0JAKkS055dRkE8Lykjf +hqHqwFDXWeb7UZc1Ru3OmsX51KFcynTqkq/c8zotmUDeZJA8YcMrLbcXKnDHQXyp +lTJxdqqjRgNeXmOBfDM7H3m6LAf814EbrVwYUMCEi50Dhv52763Z3owmMvPOfAh0 +Y/r/6DCmBV9FIZTlxOb/zeCgM8qRDCwGlSIWIcP3/Wz7HTduXLJQsoDhXstRT+ns ++sp5UjyYff/xoRF0n/HjrUZ0I5Al4EQIXYNACPhBzCaQVOd7v9wkCbGeeLu/oHIz +HLjPgiJDxyvMSQgJucsozDrK13g4CUyG3q4ELWoUpqiA21RSHm14zZCnhJmPNCPu +T/wFjyhFC3eGzg4NbmWQxosBrW3QBRd+drhT61JWj6rSFN+sYdc+FtGwxn1k7x/2 +AGG61FlmwjESDX/SyaKUudLya1PFwE6GogVqyz5w72/lL7Av5KPU3v/KE3j1Nyf2 +UaIvroJEroR+ARynKC2tANiaYMQFpcFe+F8y19AdOUYQiZMmF67m+JLyv5hKnGNI From 17e059c203224fcebfca316e4d6a24f47581632a Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 20 Feb 2023 20:10:35 -0600 Subject: [PATCH 3/4] Remove syncthing --- modules-linux/automatic/default.nix | 1 - modules-linux/automatic/syncthing.nix | 46 --------------------------- 2 files changed, 47 deletions(-) delete mode 100644 modules-linux/automatic/syncthing.nix diff --git a/modules-linux/automatic/default.nix b/modules-linux/automatic/default.nix index f20fb29..8b667f9 100644 --- a/modules-linux/automatic/default.nix +++ b/modules-linux/automatic/default.nix @@ -2,7 +2,6 @@ { imports = [ - ./syncthing.nix ./users.nix ]; } diff --git a/modules-linux/automatic/syncthing.nix b/modules-linux/automatic/syncthing.nix deleted file mode 100644 index 1778dba..0000000 --- a/modules-linux/automatic/syncthing.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ ... }: - -let - syncs = [ - "nas" - "dns" - "linode" - ]; -in -{ - services.syncthing = { - enable = false; - user = "greg"; - group = "users"; - dataDir = "/home/greg/sync"; - devices = { - nas = { - addresses = [ - "tcp://nas.thehellings.lan:22000" - "tcp://chronicles.greg-hellings.gmail.com.beta.tailscale.net:22000" - ]; - id = "74JUTZG-77EPGO3-FEYCL2P-CHDWP5G-6EXWZVB-XTAH6O5-TUXCVY2-QNRHSQ4"; - }; - dns = { - addresses = [ - "tcp://dns.thehellings.lan:22000" - "tcp://2maccabees.greg-hellings.gmail.com.beta.tailscale.net:22000" - ]; - id = "C4XJCH7-3ZNW6XZ-R5DB2EU-OEGVVT2-WPHQAG7-UDWER36-6NO5KZR-4MN5VAK"; - }; - linode = { - addresses = [ - "tcp://linode.thehellings.com:22000" - ]; - id = "ROZPUG5-G4IAXYA-JNRQXRD-5PFU2BQ-WVJTOGZ-DFMGJ5E-Q4IGXCJ-JHSNDQ6"; - }; - }; - folders = { - "mkrvy-tc6x9" = { - path = "/home/greg/drive"; - enable = true; - devices = syncs; - }; - }; - }; -} From 10e3a170a33234b70cca98176fa04900fd697ed9 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 20 Feb 2023 20:16:56 -0600 Subject: [PATCH 4/4] Remove programming tools from everything --- home/gui/default.nix | 7 ------- home/home.nix | 4 ---- 2 files changed, 11 deletions(-) diff --git a/home/gui/default.nix b/home/gui/default.nix index d43efcf..a373e40 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -7,17 +7,10 @@ ]; home.packages = with pkgs; [ - bazel - bazel-buildtools - cargo # Rustc cdrtools ffmpeg - gcc gnucash - go - gopls handbrake - jdk11 libtheora vlc x265 diff --git a/home/home.nix b/home/home.nix index 3bb9acb..d04b9c6 100644 --- a/home/home.nix +++ b/home/home.nix @@ -33,7 +33,6 @@ bitwarden-cli diffutils findutils - gh git gnupatch gregpy @@ -42,13 +41,10 @@ jq nano nmap - nodejs openssl tmux transcrypt unzip wget - yamllint - #yawsso ]; }