From 6cabd62238835644c5292a98c02395e80689525f Mon Sep 17 00:00:00 2001
From: Fiscal Velvet Poet <fiscalvelvetpoet@jfdic.org>
Date: Mon, 15 May 2023 09:25:48 +1000
Subject: [PATCH] removed all references to deprecated tool NixOps

---
 .envrc                         | 1 -
 default.nix                    | 1 -
 networks/linode.nix            | 2 +-
 profiles/chrony.nix            | 2 +-
 profiles/host_common.nix       | 2 +-
 profiles/logrotate.nix         | 2 +-
 profiles/nix-direnv.nix        | 2 +-
 profiles/reciproka-forgejo.nix | 4 +---
 profiles/reciproka-web.nix     | 2 +-
 profiles/voc-web.nix           | 2 +-
 10 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.envrc b/.envrc
index 461a3d0..c242529 100644
--- a/.envrc
+++ b/.envrc
@@ -3,4 +3,3 @@ watch_file flake.nix
 
 # Allow ragenix to find it's configuration
 export RULES=$(realpath ./secrets/secrets.nix)
-export NIXOPS_DEPLOYMENT=jfdic-ops
diff --git a/default.nix b/default.nix
index bfce7af..e03ebb3 100644
--- a/default.nix
+++ b/default.nix
@@ -14,6 +14,5 @@ with import ./nix args; {
       treefmt # one CLI to format the code tree
     ];
     NIX_PATH = "nixpkgs=${sources.nixpkgs}";
-    NIXOPS_DEPLOYMENT = "${globals.deploymentName}";
   };
 }
diff --git a/networks/linode.nix b/networks/linode.nix
index ad820f0..aaa7551 100644
--- a/networks/linode.nix
+++ b/networks/linode.nix
@@ -1,4 +1,4 @@
-# NixOps configuration for the Linode VMs
+# Nix configuration for the Linode VMs
 {
   config,
   pkgs,
diff --git a/profiles/chrony.nix b/profiles/chrony.nix
index 7064557..4a1540c 100644
--- a/profiles/chrony.nix
+++ b/profiles/chrony.nix
@@ -1,4 +1,4 @@
-# NixOps configuration for the hosts running a Chrony service
+# Nix configuration for the hosts running a Chrony service
 {config, ...}: {
   services.chrony = {
     enable = true; # Enable Chrony
diff --git a/profiles/host_common.nix b/profiles/host_common.nix
index 28d1aad..2fec397 100644
--- a/profiles/host_common.nix
+++ b/profiles/host_common.nix
@@ -56,7 +56,7 @@
         cfg =
           pkgs.writeText "configuration.nix"
           ''
-            assert builtins.trace "This system is managed by NixOps." false;
+            assert builtins.trace "This system is managed by Colmena." false;
             {}
           '';
       in "nixos-config=${cfg}")
diff --git a/profiles/logrotate.nix b/profiles/logrotate.nix
index f656690..89f8c9f 100644
--- a/profiles/logrotate.nix
+++ b/profiles/logrotate.nix
@@ -1,4 +1,4 @@
-# logrotate configuration for NixOS / NixOps
+# logrotate configuration for NixOS
 {config, ...}: {
   services.logrotate = {
     enable = true; # Enable the logrotate service
diff --git a/profiles/nix-direnv.nix b/profiles/nix-direnv.nix
index 4ff7d62..97bb4b6 100644
--- a/profiles/nix-direnv.nix
+++ b/profiles/nix-direnv.nix
@@ -1,4 +1,4 @@
-# NixOps configuration nix-direnv
+# Nix configuration nix-direnv
 {
   config,
   pkgs,
diff --git a/profiles/reciproka-forgejo.nix b/profiles/reciproka-forgejo.nix
index cc99b37..5f2656d 100644
--- a/profiles/reciproka-forgejo.nix
+++ b/profiles/reciproka-forgejo.nix
@@ -54,7 +54,7 @@ in {
   systemd = {
     services = {
       gitea = {
-        # Ensure gitea starts after nixops keys are loaded
+        # Ensure gitea starts after keys are loaded
         after = ["gitea-dbpass-key.service"];
         wants = ["gitea-dbpass-key.service"];
       };
@@ -112,6 +112,4 @@ in {
       "source.jfdic.org".email = "admin@reciproka.co";
     };
   };
-
-  users.groups.keys.members = ["gitea"]; # Required due to NixOps issue #1204
 }
diff --git a/profiles/reciproka-web.nix b/profiles/reciproka-web.nix
index 2dce8ad..7226242 100644
--- a/profiles/reciproka-web.nix
+++ b/profiles/reciproka-web.nix
@@ -1,4 +1,4 @@
-# NixOps configuration for deploying the Reciproka Kolectiva website
+# Nix configuration for deploying the Reciproka Kolectiva website
 {
   self,
   config,
diff --git a/profiles/voc-web.nix b/profiles/voc-web.nix
index 655dfa6..34d706a 100644
--- a/profiles/voc-web.nix
+++ b/profiles/voc-web.nix
@@ -1,4 +1,4 @@
-# NixOps configuration for deploying the Voices of Capricornia website
+# Nix configuration for deploying the Voices of Capricornia website
 {
   self,
   config,