Cleanup

.build.yml

@@ -1,21 +0,0 @@
-image: nixos/unstable
-secrets:
-  - b0e58bfc-64c4-4b93-9054-b5db47d96a49
-  - a3f6aa54-9243-4808-b5a5-414644732c02
-  - 9972d0f8-7159-4057-bb0c-648d8deac791
-  - a2e02b24-b89f-4d60-8319-c6883b567430
-packages:
-  - nixos.terraform
-  - nixos.awscli2
-sources:
-  - git@git.sr.ht:~gmem/infra
-tasks:
-  - terraform-plan: |
-      set +x
-      aws configure import --csv file://.aws.csv
-      export AWS_PROFILE=terraform-srht
-      export VERCEL_API_TOKEN=$(cat ~/.vercel)
-      set -x
-      cd infra
-      terraform -chdir=terraform init
-      terraform -chdir=terraform plan

flake.lock

@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693972774,
+        "lastModified": 1694134858,
-        "narHash": "sha256-Dt9UZs0/DaIex598quYRYFuGabUbvFdNrHuvGc6HjBc=",
+        "narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b22d7bab30076bbb73744867d6c5bf7d6380570c",
+        "rev": "19c6a4081b14443420358262f8416149bd79561a",
         "type": "github"
       },
       "original": {
@@ -218,11 +218,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1694032533,
+        "lastModified": 1694062546,
-        "narHash": "sha256-I8cfCV/4JNJJ8KHOTxTU1EphKT8ARSb4s9pq99prYV0=",
+        "narHash": "sha256-PiGI4f2BGnZcedP6slLjCLGLRLXPa9+ogGGgVPfGxys=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "efd23a1c9ae8c574e2ca923c2b2dc336797f4cc4",
+        "rev": "b200e0df08f80c32974a6108ce431d8a8a5e6547",
         "type": "github"
       },
       "original": {

flake.nix

@@ -5,8 +5,10 @@
     terranix.url = "github:terranix/terranix";
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     nixinate.url = "github:matthewcroughan/nixinate";
-    home-manager.url = "github:nix-community/home-manager";
+    home-manager = {
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";

nix/krops.nix

@@ -1,96 +0,0 @@
-let
-  krops = builtins.fetchGit {
-    url = "https://cgit.krebsco.de/krops/";
-  };
-  lib = import "${krops}/lib";
-  pkgs = import "${krops}/pkgs" {};
-
-  oracle-gitea-runner-source =  lib.evalSource [
-    {
-      nixpkgs.git = {
-        ref = "ea95c0917609e5c48023cc7c6141bea2fdf13970";
-        url = https://github.com/NixOS/nixpkgs;
-
-        shallow = true;
-      };
-      nixos-config.file = toString ./oracle-gitea-runner/configuration.nix;
-      "hardware.nix".file = toString ./oracle-gitea-runner/hardware.nix;
-    }
-  ];
-
-  oracle-nix-cache-source =  lib.evalSource [
-    {
-      nixpkgs.git = {
-        ref = "66aedfd010204949cb225cf749be08cb13ce1813";
-        url = https://github.com/NixOS/nixpkgs;
-
-        shallow = true;
-      };
-      nixos-config.file = toString ./oracle-nix-cache/configuration.nix;
-      "hardware.nix".file = toString ./oracle-nix-cache/hardware.nix;
-    }
-  ];
-
-  nas-source =  lib.evalSource [
-    {
-      nixpkgs.git = {
-        ref = "origin/nixos-unstable";
-        url = https://github.com/NixOS/nixpkgs;
-      };
-      home-manager.git = {
-        ref = "origin/master";
-        url = https://github.com/nix-community/home-manager;
-      };
-      nixos-config.file = toString ./nas/configuration.nix;
-      "hardware.nix".file = toString ./nas/hardware.nix;
-      "n8n.nix".file = toString ./nas/nixpkgs/n8n.nix;
-      "dns.db".file = toString ./nas/dns.db;
-    }
-  ];
-
-  seattle-source =  lib.evalSource [
-    {
-      nixpkgs.git = {
-        ref = "6e287913f7b1ef537c97aa301b67c34ea46b640f";
-        url = https://github.com/NixOS/nixpkgs;
-        shallow = true;
-      };
-      nixos-config.file = toString ./seattle/configuration.nix;
-      "hardware.nix".file = toString ./seattle/hardware.nix;
-    }
-  ];
-
-  glasgow-source =  lib.evalSource [
-    {
-      nixpkgs.git = {
-        ref = "6e287913f7b1ef537c97aa301b67c34ea46b640f";
-        url = https://github.com/NixOS/nixpkgs;
-        shallow = true;
-      };
-      nixos-config.file = toString ./glasgow/configuration.nix;
-      "hardware.nix".file = toString ./glasgow/hardware.nix;
-    }
-  ];
-  
-in {
-  oracle-gitea-runner = pkgs.krops.writeDeploy "oracle-gitea-runner" {
-    source = oracle-gitea-runner-source;
-    target = "root@143.47.229.209";
-  };
-  oracle-nginx-funnel = pkgs.krops.writeDeploy "oracle-nginx-funnel" {
-    source = oracle-nix-cache-source;
-    target = "root@141.147.109.157";
-  };
-  nas = pkgs.krops.writeDeploy "nas" {
-    source = nas-source;
-    target = "root@192.168.50.229";
-  };
-  seattle = pkgs.krops.writeDeploy "seattle" {
-    source = seattle-source;
-    target = "root@seattle";
-  };
-  glasgow = pkgs.krops.writeDeploy "glasgow" {
-    source = glasgow-source;
-    target = "root@192.168.50.144";
-  };
-}

nix/london/gsimmer.nix

@@ -20,6 +20,10 @@
     homeDirectory = "/home/gsimmer";
   };
 
+  services.syncthing = {
+    enable = true;
+  };
+  
   programs = {
     bash.enable = false;
     fish = {
@@ -531,7 +535,7 @@ $env.config = {
       ];
     };
 
-    exa = {
+    eza = {
       enable = true;
       enableAliases = true;
     };

nix/nas/home.nix

@@ -53,6 +53,11 @@ end
     ];
   };
 
+  services.syncthing = {
+    enable = true;
+    extraOptions = [ "--gui-address=100.116.48.47:8384" ];
+  };
+  
   programs.direnv = {
     enable = true;
     nix-direnv.enable = true;
@@ -68,7 +73,7 @@ end
     ];
   };
 
-  programs.exa = {
+  programs.eza = {
     enable = true;
     enableAliases = true;
   };