From a554841ac8cbfa364a93c33a5a8128de9c2f789b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Tue, 27 Feb 2024 18:20:44 +0200 Subject: [PATCH] remove mtwork --- README.md | 2 -- data.nix | 6 ------ flake.nix | 16 ---------------- hosts/vno1-oh2/configuration.nix | 4 ---- modules/services/syncthing/default.nix | 9 +++------ 5 files changed, 3 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 2bba2d1..ad4c62f 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,6 @@ Flakes: Other: $ nix build .#nixosConfigurations.vno3-rp3b.config.system.build.toplevel - $ nix build .#homeConfigurations.x86_64-linux.motiejusja.activationPackage - $ nix eval .#nixosConfigurations.vno1-oh2.config.services.nsd Encoding host-only secrets diff --git a/data.nix b/data.nix index d61e38c..db70260 100644 --- a/data.nix +++ b/data.nix @@ -75,11 +75,6 @@ rec { publicIP = "168.119.184.134"; jakstIP = "100.89.176.5"; }; - "mtwork.motiejus.jakst" = rec { - extraHostNames = [jakstIP]; - publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHlWSZ/H6DR5i5aCrlrEQLVF9MXNvls/pjlLPLaav3f+"; - jakstIP = "100.89.176.11"; - }; "fwminex.motiejus.jakst" = rec { extraHostNames = [jakstIP vno1IP]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHlWSZ/H6DR5i5aCrlrEQLVF9MXNvls/pjlLPLaav3f+"; @@ -114,7 +109,6 @@ rec { mHosts = attrVals [ "mxp10.motiejus.jakst" - "mtwork.motiejus.jakst" "fwminex.motiejus.jakst" ] hosts; diff --git a/flake.nix b/flake.nix index bea248d..85a58b2 100644 --- a/flake.nix +++ b/flake.nix @@ -301,7 +301,6 @@ statix.enable = true; }; }; - hm = self.homeConfigurations.${system}.motiejusja.activationPackage; } ) deploy-rs.lib; @@ -309,21 +308,6 @@ // flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs {inherit system overlays;}; in { - homeConfigurations.motiejusja = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ - shared/home - ]; - extraSpecialArgs = { - inherit self system; - stateVersion = "23.05"; - username = "motiejus"; - email = "motiejusja@wix.com"; - devTools = true; - hmOnly = true; - }; - }; - devShells.default = pkgs.mkShellNoCC { packages = [ pkgs.rage diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix index 74034fa..4c1a744 100644 --- a/hosts/vno1-oh2/configuration.nix +++ b/hosts/vno1-oh2/configuration.nix @@ -468,10 +468,6 @@ job_name = "fra1-a.servers.jakst"; static_configs = [{targets = ["${myData.hosts."fra1-a.servers.jakst".jakstIP}:${port}"];}]; } - { - job_name = "mtwork.motiejus.jakst"; - static_configs = [{targets = ["${myData.hosts."mtwork.motiejus.jakst".jakstIP}:9100"];}]; - } { job_name = "vno3-rp3b.servers.jakst"; static_configs = [{targets = ["${myData.hosts."vno3-rp3b.servers.jakst".jakstIP}:${port}"];}]; diff --git a/modules/services/syncthing/default.nix b/modules/services/syncthing/default.nix index 4585d5e..a8835fc 100644 --- a/modules/services/syncthing/default.nix +++ b/modules/services/syncthing/default.nix @@ -7,7 +7,6 @@ cfg = config.mj.services.syncthing; devices = { - "mtwork".id = "3XRWDGO-M42WJAK-MGR24VJ-B5TNQXH-7R5YNFI-MAGXALL-XFENVI4-XYDPMAM"; "fwminex".id = "GKSUKZE-AOBQOWY-CNLZ2ZI-WNKATYE-MV4Y452-J3VCJ5C-EAANXRX-2P6EHA6"; "vno1-oh2".id = "W45ROUW-CHKI3I6-C4VCOCU-NJYQ3ZS-MJDHH23-YYCDXTI-HTJSBZJ-KZMWTAF"; "mxp10".id = "LO54QZZ-5J3G62P-WUVM3MW-7J3VWHD-BG76TOQ-5S7PZSY-JU45K3I-X3ZL4AN"; @@ -19,7 +18,7 @@ }; folders = { Books = { - devices = ["fwminex" "vno1-oh2" "mxp10" "mtwork"]; + devices = ["fwminex" "vno1-oh2" "mxp10"]; id = "8lk0n-mm63y"; label = "Books"; }; @@ -29,7 +28,7 @@ label = "Mail"; }; M-Active = { - devices = ["mxp10" "fwminex" "vno1-oh2" "mtwork"]; + devices = ["mxp10" "fwminex" "vno1-oh2"]; id = "f6fma-unkxq"; label = "M-Active"; versioning = { @@ -56,7 +55,7 @@ label = "M-V"; }; M-Camera = { - devices = ["mxp10" "fwminex" "vno1-oh2" "mtwork"]; + devices = ["mxp10" "fwminex" "vno1-oh2"]; id = "pixel_xl_dtm3-photos"; label = "M-Camera"; }; @@ -138,7 +137,6 @@ in { // (lib.optionalAttrs (config.networking.hostName == "vno1-oh2") { inherit (devices) - mtwork fwminex vno1-oh2 mxp10 @@ -152,7 +150,6 @@ in { // (lib.optionalAttrs (config.networking.hostName == "fwminex") { inherit (devices) - mtwork fwminex vno1-oh2 mxp10