From 28dcb1f574c3dc77cfa7a96da3398027dd88a158 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Wed, 19 Jun 2024 22:50:58 +0200
Subject: [PATCH] Update

---
 home/server.nix                |  1 -
 home/system/sops/server.nix    | 31 -------------------------
 hosts/modules/server/sops.nix  | 41 ++++++++++++----------------------
 hosts/server/configuration.nix |  1 +
 4 files changed, 15 insertions(+), 59 deletions(-)
 delete mode 100644 home/system/sops/server.nix

diff --git a/home/server.nix b/home/server.nix
index 88b9c42..6402592 100644
--- a/home/server.nix
+++ b/home/server.nix
@@ -13,7 +13,6 @@
     # System
     ./system/git
     ./system/shell
-    # ./system/sops/server.nix # You should probably remove this line
   ];
 
   home = {
diff --git a/home/system/sops/server.nix b/home/system/sops/server.nix
deleted file mode 100644
index 0e645a1..0000000
--- a/home/system/sops/server.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ pkgs, ... }: {
-  # imports = [ inputs.sops-nix.homeManagerModules.sops ];
-
-  home.packages = with pkgs; [ sops age ];
-
-  # sops = {
-  #   age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
-  #   defaultSopsFile = ../../../secrets/server.yaml;
-  #   secrets = {
-  #     sshconfig = { path = "/home/hadi/.ssh/config"; };
-  #     github-key = { path = "/home/hadi/.ssh/github"; };
-  # nextcloud-adminpass = {
-  #   path = "/etc/nextcloud/adminpassFile";
-  #   owner = "nextcloud";
-  #   group = "nextcloud";
-  # };
-  # cloudflare-apitoken = {
-  #   path = "/etc/cloudflare/apiToken";
-  #   owner = "cloudflare-dyndns";
-  #   group = "cloudflare-dyndns";
-  # };
-  # tailscaled-authKey = {
-  #   path = "/etc/tailscale/authKey";
-  #   owner = "tailscaled";
-  #   group = "tailscaled";
-  # };
-  # };
-  # };
-
-  # systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ];
-}
diff --git a/hosts/modules/server/sops.nix b/hosts/modules/server/sops.nix
index eeb60aa..932869c 100644
--- a/hosts/modules/server/sops.nix
+++ b/hosts/modules/server/sops.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{
 
   sops = {
     age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
@@ -13,34 +13,21 @@
         path = "/home/hadi/.ssh/github";
         owner = "hadi";
       };
+      # nextcloud-adminpass = {
+      #   path = "/etc/nextcloud/adminpassFile";
+      #   owner = "nextcloud";
+      #   group = "nextcloud";
+      # };
       cloudflare-apitoken = {
-        path = "/home/hadi/test.txt";
-        owner = "hadii";
+        path = "/etc/cloudflare/apiToken";
+        owner = "cloudflare-dyndns";
+        group = "cloudflare-dyndns";
       };
+      # tailscaled-authKey = {
+      #   path = "/etc/tailscale/authKey";
+      #   owner = "tailscaled";
+      #   group = "tailscaled";
+      # };
     };
   };
 }
-
-# sops = {
-#   age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
-#   defaultSopsFile = ../../../secrets/server.yaml;
-#   secrets = {
-#     sshconfig = { path = "/home/hadi/.ssh/config"; };
-#     github-key = { path = "/home/hadi/.ssh/github"; };
-# nextcloud-adminpass = {
-#   path = "/etc/nextcloud/adminpassFile";
-#   owner = "nextcloud";
-#   group = "nextcloud";
-# };
-# cloudflare-apitoken = {
-#   path = "/etc/cloudflare/apiToken";
-#   owner = "cloudflare-dyndns";
-#   group = "cloudflare-dyndns";
-# };
-# tailscaled-authKey = {
-#   path = "/etc/tailscale/authKey";
-#   owner = "tailscaled";
-#   group = "tailscaled";
-# };
-# };
-# };
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index fb9ec97..5c4571f 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -5,6 +5,7 @@
     ../modules/server/security.nix
     ../modules/server/openssh.nix
     ../modules/server/sops.nix
+    ../modules/server/cloudflare-dyndns.nix
   ];
 
   # Bootloader.