From 755a2e8f2b2b79a9625361acd9c218b64aaad623 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:05:49 +0200
Subject: [PATCH] Update

---
 home/scripts/nixy/default.nix  | 7 ++++++-
 home/system/sops/server.nix    | 1 +
 hosts/server/configuration.nix | 2 +-
 hosts/server/nextcloud.nix     | 8 ++++++++
 secrets/secrets.yaml           | 5 +++--
 5 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 hosts/server/nextcloud.nix

diff --git a/home/scripts/nixy/default.nix b/home/scripts/nixy/default.nix
index d5f7314..3fdb5d5 100644
--- a/home/scripts/nixy/default.nix
+++ b/home/scripts/nixy/default.nix
@@ -23,6 +23,10 @@ let
     sudo /run/current-system/bin/switch-to-configuration boot
   '';
 
+  nixy-push = pkgs.writeShellScriptBin "nixy-push" ''
+    cd ~/.config/nixos && git add . && git commit -m ''${1:-Update} && git push
+  '';
+
   heaven-rebuild = pkgs.writeShellScriptBin "heaven-rebuild" ''
     sudo nixos-rebuild switch --flake ${homedir}/.config/nixos#heaven
   '';
@@ -44,7 +48,7 @@ let
   '';
 
   remote-rebuild = pkgs.writeShellScriptBin "remote-rebuild" ''
-    ssh heaven "cd ~/.config/nixos && git pull && heaven-rebuild"
+    ssh -t heaven "cd ~/.config/nixos && git pull && heaven-rebuild"
   '';
 
 in {
@@ -54,6 +58,7 @@ in {
     nixy-update
     nixy-gc
     nixy-cb
+    nixy-push
     heaven-rebuild
     heaven-upgrade
     heaven-update
diff --git a/home/system/sops/server.nix b/home/system/sops/server.nix
index a518969..a030083 100644
--- a/home/system/sops/server.nix
+++ b/home/system/sops/server.nix
@@ -7,6 +7,7 @@
     secrets = {
       gts = { path = "/home/hadi/.ssh/github"; };
       sshconfigheaven = { path = "/home/hadi/.ssh/config"; };
+      nextcloudpwd = { path = "/home/hadi/nextcloud/pwd"; };
     };
   };
 
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 0590c3c..0d73d2c 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -1,7 +1,7 @@
 { pkgs, config, ... }:
 let variable = import ../../variables.nix;
 in {
-  imports = [ ./hardware-configuration.nix ./openssh.nix ];
+  imports = [ ./hardware-configuration.nix ./openssh.nix ./nextcloud.nix ];
 
   boot = {
     loader.efi.canTouchEfiVariables = true;
diff --git a/hosts/server/nextcloud.nix b/hosts/server/nextcloud.nix
new file mode 100644
index 0000000..d18106f
--- /dev/null
+++ b/hosts/server/nextcloud.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  services.nextcloud = {
+    enable = true;
+    package = pkgs.nextcloud28;
+    hostName = "localhost";
+    config.adminpassFile = "/home/hadi/nextcloud/pwd";
+  };
+}
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index 4b32448..94bad66 100644
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -6,6 +6,7 @@ glk: ENC[AES256_GCM,data:N/ius8Rd2q6BeaCGqaI9TIYEvSmYwqMroxnyWr4xYa+cZONhAGPS4qS
 silicon: ENC[AES256_GCM,data:7gyAj0rfRtggcwveC82UGaj0ZfKymKmf+fhErjFGaIlxyeOG2jgIHpa2ckb2GDiXMLjUAMBiFOISzXut8aERg30DZnAKam7XnuRK3Ue6w9e9Wzb7sSAAI1iFINNFDf2fGdTEpObyXejvjHUcLk2hY/BusCCiqW3dIuSxFtIaIOcuaRAMI/7UkhhyWihwJaP3ZiovFHpBds3d2538ahJy9cUHnShwDcTi/cXph2DNjFTTZE8mlGTrNQ0wRoXgi0o9GNwHcDi+CgFg0WoR5yma00BuFtEN0ymt6vES0mrtuZBhn52HXO32oFKajqssyQe4e9gxREUw89W64xMiYBmBInP9Fq+9uT/7yxhrKP3BaFZi9AVNJtHVu/UkwxOxwUCvt18IvSkRgOH+ayH+qCUOZxtuPcfrjiGk7QEgNfNvegKzlNjaeKeew4pA8Yz2tm4QWgpm0+SilSwuzF8wxHcHspYdBtMzNEHg1dyC7uuwygkMkRcR9f1XCUR1tiB+rBeXoOKoIynD819wkhvJSKGR1+aBgjnJF09wd1tVus3yk3FYqzPevHlxH4M79Cs1QXAlVhligL3uvEfYQ+TM,iv:JXivO8dSxrIhezChQhYrsexJg0dwc68Nn2jOwiQhADk=,tag:iZiwrQDoB5ABZ0iziVwTQg==,type:str]
 heaven: ENC[AES256_GCM,data:vkp1rptFv7FHo8Rgk1TXS8GgYzgxlmWqB5xvFSjZB3gm3XFVqLei2WsxYsE/pKWb0l3Xqu98uE5bnRvsNcWzLRCmlF/ByVtcXZrovD4kHXrsq0MhBPLRvKAfAOnCsmw/6/rCy1IlRWuH2OHMhgG4Mv47nf0mMcgM+2mr3kVvxKf6dNyK0eQ9D+pOjr/jZrkaHZJZ0UA2iMIl16BWQSLVRQhbOSDzYGfYr/LfXWHsJPhy3TiSK+jHC2JUpD3pYy1Hf9u/fTDmrwOkshZGdMUzIatVHZpcxF/ZV/S8YxGSeJhnmoZ3sgdZ7gKDhpsntOKZGQ5SP/sZobjqhGjSkN+7m4aX9MCnlPx0H/YB5iGG9mNTbkmpGKXm2btWFCtkkzycSHwoQaPD+c4zmBo2AmeeS1ullVJZl/vgocqN0EFkmDzCRTpUIyUwXBhGu2wjPFRmUrqbs0PoD8mq+U3jbROkg+pct/sx6vUnG0oWqGN+LIaWcPl7CrlgWbArysBtYxq8fHhVrav2KalBa5VULtZM,iv:1sjPiHi1eXtrrwwS6sXQIz+0Bc21E3d+H4Gu4WC4yfY=,tag:8GaFXWM46EYlp9vljnaGqA==,type:str]
 gts: ENC[AES256_GCM,data:1A3ibn9TdIh5oQjHpcSTg2GBSA5QsVVreXIAFAspNILbe/Rpo3XPIqa26GRqLLjywzeAIfu926N17kxL+bmRHHU23ltceG0f2h+rF6iaWjjv2PvfHEAZbNDcR7yDdmODCXRpIIArorXi76hmX0mFX7DI5Gc9ytD930gKeIp1dhs7tTCddwAJTBra9oC4ga0YDEHzzAtfT35s0hRC4u7LJdvBElaVKJFkxCqx62y6zB1OgCcv8oSDibvC+71LA0/krdVnwbK77TIm23LiaCoXP5IizjR7h5VWf0gmepW/ED4xaRHxDUqhfUAumIeSW+kvp2TDZ4T/qvIwgafMyxZ9jZozBy1VI50IMkJl9KeZJZaB3FHE3x7UxwBzvO8E7svK+33fUU/o7TX4Qtq2UUPNG2aGjyfR956ezrWGMz5+Tl6wtATBuKckUSxmLorKjL/soTk/SA2uSFI09CPJ0Rg0D3LeMh5IgzEVgt8KPoR+yQUNmt1z7D9zurnonJ6EvYJKatOv9okwt52EmuhaTcre,iv:1ZBT7UQty8oC5bxbzdkkgbi6zEPzd9fBy8kY5MJukmg=,tag:zOWkS3BIN7DnniWSGywxdQ==,type:str]
+nextcloudpwd: ENC[AES256_GCM,data:6dp/iZCS6awDq8u5oNFjqXr7jxtx9xOkYCq1,iv:cWGLjv8c4qPl1N2Uipm3AhYhYZHo+FiqUXQxneYjuqc=,tag:u8b7ObyrLbudtKLcsxvb9Q==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -21,8 +22,8 @@ sops:
             cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo
             FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-07T19:27:54Z"
-    mac: ENC[AES256_GCM,data:3vHs+YnzGDsBRRbT83uvumDtrV/jfMHBdCDirw9otSfkKPUj7kgfkSae4RFISH5+X48xbhICThVRTUPiOQFlvR+T3M7SZjM3ptfg6gmk3RwX2LQFMLo51tYtkWnjYexZqckUDKm48G8Eh7ye8dN7YqrMJ7/iYkYGPTZkmmNSgMM=,iv:xyNAGpaFhdBUKsmSCCzN/L1P3m0tJsVPoCMCI3png0g=,tag:crI+mgIgAmGwmQlC8FKWLQ==,type:str]
+    lastmodified: "2024-06-07T20:01:42Z"
+    mac: ENC[AES256_GCM,data:DUnP36T6E0kCN1hRWY5ggJwMhrka91eswz5foKCoCwXlBpCySNomDn/I9pd0SmrvpPxo7+h8BKnQADkhonrhuDKBKZ5XC1t34YWiEg7YoCezW3cpU6hDhtT5IyUYAduLnqm6gH2hA8VSgMKdREGp+lJ8yy/hr7RPkYldbFPgTLg=,iv:5AilMqCUAQANtLFdIXubx8rnDGBJvBGCD2Nw5ceMmlU=,tag:i8CuCPC7+woGRnpNmzvr3w==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1