fix: vterm remote shell + nextcloud

SwarselSystems.org

@@ -2057,6 +2057,7 @@ My work machine. Built for more security, this is the gold standard of my config
         spotifyd =true;
         mpd = false;
         matrix = true;
+        nextcloud = true;
       };
     };
 
@@ -2267,6 +2268,7 @@ In the long run, I am thinking about a transition to kubernetes or using just a
       recommendedGzipSettings = true;
       virtualHosts = {
 
+
         "stash.swarsel.win" = {
           enableACME = true;
           forceSSL = true;
@@ -4740,6 +4742,7 @@ I usually use =mutableUsers = false= in my NixOS configuration. However, on a ne
     options.swarselsystems.server.spotifyd = lib.mkEnableOption "enable spotifyd on server";
     options.swarselsystems.server.mpd = lib.mkEnableOption "enable mpd on server";
     options.swarselsystems.server.matrix = lib.mkEnableOption "enable matrix on server";
+    options.swarselsystems.server.nextcloud = lib.mkEnableOption "enable nextcloid on server";
   }
 #+end_src
 
@@ -5169,7 +5172,6 @@ Also, the system state version is set here. No need to touch it.
       # ./yubikey-touch-detector.nix
       ./safeeyes.nix
       ./lid.nix
-      ./emacs.nix
     ];
 
     nix =
@@ -5769,10 +5771,11 @@ I use sops-nix to handle secrets that I want to have available on my machines at
           WIREGUARDENDPOINT=${config.sops.placeholder.wireguardendpoint}
         '';
         ".authinfo" = {
+          owner = "swarsel";
           path = "${config.users.users.swarsel.home}/.emacs.d/.authinfo";
           content = ''
             machine stash.swarsel.win:443 port https login ${config.sops.placeholder.stashuser} password ${config.sops.placeholder.stashpass}
-            machine gitlab.com/api/v4 login ${config.sops.placeholder.githubforgeuser} password glpat-72Wpzs2uuz--LfNHZFzW ${config.sops.placeholder.githubforgepass}
+            machine gitlab.com/api/v4 login ${config.sops.placeholder.githubforgeuser} password ${config.sops.placeholder.githubforgepass}
             machine api.github.com login ${config.sops.placeholder.gitlabforgeuser} password ${config.sops.placeholder.gitlabforgepass}
           '';
         };
@@ -6599,18 +6602,6 @@ This turns off the display when the lid is closed.
   }
 #+end_src
 
-**** Emacs
-#+begin_src nix :tangle profiles/common/nixos/emacs.nix
-  _:
-  {
-
-      services.emacs = {
-        enable = true;
-      };
-
-  }
-#+end_src
-
 *** Server
 **** Imports, stateVersion
 
@@ -6642,6 +6633,7 @@ Also, the system state version is set here. No need to touch it.
       ./spotifyd.nix
       ./mpd.nix
       ./matrix.nix
+      ./nextcloud.nix
     ];
 
     nix =
@@ -7416,6 +7408,64 @@ Also, the system state version is set here. No need to touch it.
 
 #+end_src
 
+**** nextcloud
+
+#+begin_src nix :tangle profiles/server/common/nextcloud.nix
+  { pkgs, lib, config, ... }:
+  {
+    config = lib.mkIf config.swarselsystems.server.nextcloud {
+
+      sops.secrets.nextcloudadminpass = { owner = "nextcloud"; };
+
+      services.nextcloud = {
+        enable = true;
+        hostName = "stash.swarsel.win";
+        home = "/Vault/apps/nextcloud";
+        datadir = "/Vault/data/nextcloud";
+        https: true;
+        configureRedis = true;
+        maxUploadSize = "4G";
+        extraApps = {
+          inherit (pkgs.nextcloud30Packages.apps) mail calendar contact cospend phonetrack polls tasks;
+        };
+        config = {
+          adminuser = "admin";
+          adminpassFile = config.sops.secrets.nextcloudadminpass.path;
+        };
+      };
+
+
+      services.nginx = {
+        virtualHosts = {
+          "stash.swarsel.win" = {
+            enableACME = true;
+            forceSSL = true;
+            acmeRoot = null;
+            locations = {
+              "/" = {
+                proxyPass = "https://192.168.1.5";
+                extraConfig = ''
+                  client_max_body_size 0;
+                '';
+              };
+              # "/push/" = {
+              # proxyPass = "http://192.168.2.5:7867";
+              # };
+              "/.well-known/carddav" = {
+                return = "301 $scheme://$host/remote.php/dav";
+              };
+              "/.well-known/caldav" = {
+                return = "301 $scheme://$host/remote.php/dav";
+              };
+            };
+          };
+        };
+      };
+    };
+
+  }
+#+end_src
+
 
 *** Optional
 :PROPERTIES:
@@ -8580,6 +8630,22 @@ Here we set some aliases (some of them should be shellApplications instead) as w
                   printf "\e]%s\e\\" "$1"
                 fi
                          }
+  vterm_prompt_end() {
+      vterm_printf "51;A$(whoami)@$(hostname):$(pwd)"
+  }
+  setopt PROMPT_SUBST
+  PROMPT=$PROMPT'%{$(vterm_prompt_end)%}'
+
+  vterm_cmd() {
+    local vterm_elisp
+    vterm_elisp=""
+    while [ $# -gt 0 ]; do
+        vterm_elisp="$vterm_elisp""$(printf '"%s" ' "$(printf "%s" "$1" | sed -e 's|\\|\\\\|g' -e 's|"|\\"|g')")"
+        shift
+    done
+    vterm_printf "51;E$vterm_elisp"
+}
+
         '';
       };
     }
@@ -9105,7 +9171,7 @@ Lastly, I am defining some more packages here that the parser has problems findi
     };
 
     services.emacs = {
-      enable = false;
+      enable = true;
       # socketActivation.enable = false;
       # startWithUserSession = "graphical";
     };
@@ -12855,6 +12921,8 @@ Tramp allows for SSH access of files over Emacs. I have no ideas what the option
                              "-o ControlMaster=auto -o ControlPersist=yes"))
     )
 
+  (setq vterm-tramp-shells '(("ssh" "'sh'")))
+
 
 
 #+end_src
@@ -13589,34 +13657,114 @@ This sets up the =dashboard=, which is really quite useless. But, it looks cool
 
 #+begin_src emacs-lisp
 
-(use-package vterm
+  (use-package vterm
       :ensure t)
 
-#+end_src
+  (defun sudo-find-file (file-name)
-
+  "Like find file, but opens the file as root."
-*** mmm-mode
+  (interactive "FSudo Find File: ")
-
+  (let ((tramp-file-name (concat "/sudo::" (expand-file-name file-name))))
-#+begin_src emacs-lisp
+    (find-file tramp-file-name)))
-
+  ;;; vterm/config.el -*- lexical-binding: t; -*-
-  (use-package mmm-mode)
+
-  (setq mmm-global-mode 'maybe)
+    ;; Original functions overwrites tramp path with a guessed path.
-  (mmm-add-mode-ext-class 'org-mode nil 'org-nix)
+    ;; However it breaks if remote fqdn/hostname is not resolvale by local machine
-  (mmm-add-mode-ext-class 'org-mode nil 'org-elisp)
+    ;; could also break on port forwarding, multihops,
-
+    ;; custom protocol such as: docker, vagrant, ...
-  (mmm-add-group
+    ;; *if* you try to shell-side configure them.
-   'org-nix
+    ;; Easily testable with vagrant ssh port on localhost.
-   '((nix-src-block
+    ;; My workflow is to open a tramp dired on / of the remote to get a
-      :submode nix-mode
+    ;; "foothold" then open vterms from there.
-      :face org-block
+    (defun vterm--get-directory (path)
-      :front "#\\+BEGIN_SRC nix.*\n"
+      "[OVERLOADED] Get normalized directory to PATH."
-      :back "#\\+END_SRC")))
+      (when path
-
+        (let (directory)
-  (mmm-add-group
+          (if (string-match "^\\(.*?\\)@\\(.*?\\):\\(.*?\\)$" path)
-   'org-elisp
+              (progn
-   '((elisp-src-block
+                (let ((user (match-string 1 path))
-      :submode emacs-lisp-mode
+                      (host (match-string 2 path))
-      :face org-block
+                      (dir (match-string 3 path)))
-      :front "#\\+BEGIN_SRC emacs-lisp.*\n"
+                  (if (and (string-equal user user-login-name)
-      :back "#\\+END_SRC")))
+                           (string-equal host (system-name)))
-
+                      (progn
+                        (when (file-directory-p dir)
+                          (setq directory (file-name-as-directory dir))))
+                    (setq directory
+                          ;; Bellow is what i altered
+                          (file-name-as-directory (concat (file-remote-p default-directory) dir))))))
+            (when (file-directory-p path)
+              (setq directory (file-name-as-directory path))))
+          directory)))
+    ;; Injects the payload to the vterm buffer.
+    (defun me/vterm-load-config ()
+      "Pass local configuration files to vterm.
+
+  Allows remote vterm to be shell-side configured,
+  without altering remote config.
+  Also adds my personal configuration that does not rely
+  too much on external packages.
+  Prints a reasuring message to proove good faith."
+      (interactive)
+      (let (;; Bellow messages to reassure other users that look at history
+            (reasuring-message (format "Configuring shell of user %s to be emacs comptible"
+                                       user-full-name))
+            (reasuring-notice "This action is shell local, it will not affect other shells")
+            ;; Bellow lies my configuration
+            (basic-func-script (f-read-text (concat (getenv "HOME")
+                                                    "/.emacs.d/shells/sources/functions.sh")))
+            ;; Bellow lies the vterm shell-side configuration
+            ;; Must be sourced last
+            (vterm-func-script (f-read-text (concat
+                                             (file-name-directory (find-library-name "vterm"))
+                                             "/etc/emacs-vterm-bash.sh"))))
+        (vterm-insert (format "# START: %s\n" reasuring-message))
+        (vterm-insert (format "# %s\n" reasuring-notice))
+        ;; Create one single block in history
+        (vterm-insert "{\n")
+        (vterm-insert basic-func-script)
+        (vterm-insert vterm-func-script)
+        (vterm-insert "}\n")
+        ;; End the single block in history
+        (vterm-insert (format "# %s\n" reasuring-notice))
+        (vterm-insert (format "# STOP: %s\n" reasuring-message))
+        )
+      )
+
+    ;; find-file-other-window does not works great on remote:
+    ;; if given an absolute path on a remote host,
+    ;; the path will be understood as a local file since no
+    ;; tramp prefix is present, and bash does not care
+    ;; about tramp prefixes.
+    ;; Bellow we solve context before sending it to
+    ;; ffow
+    (defun me/vterm--find-file-other-window-wrapper (file)
+      "Help vterm find a FILE."
+      (find-file-other-window (me/vterm--ffow-resolver file)))
+    (defun me/vterm--ffow-resolver (file)
+      "Help vterm resolve FILE."
+      (cond
+       ;; "/sudo::"
+       ;; doom--sudo-file-path do the trick for us
+       ((s-starts-with-p "/sudo::" file)
+         (sudo-find-file
+          (concat (file-remote-p default-directory)
+                  (substring-no-properties file 7))))
+       ;; "/" means we want the "Relative root"
+       ;; try appending the remote prefix if relevent
+       ((s-starts-with-p "/" file)
+        (concat (file-remote-p default-directory) file))
+       ;; we got a relative path
+       ;; we don't need to help ffow to find it
+       (t
+        file)))
+
+    ;; The variable vterm-eval-cmds is a SERIOUSLY SENSIBLE variable !
+    ;; Do not be the guy that adds RCE into their config !
+
+    ;; Allow customed ffow to be called from vterm
+    ;; ffow should be as safe as find-file which is already trusted
+    ;; we append our resolver that only manipulate strings,
+    ;; Proove me wrong but i think it's safe.
+    (add-to-list 'vterm-eval-cmds '("find-file-other-window"
+                                    me/vterm--find-file-other-window-wrapper))
 #+end_src

modules/nixos/setup.nix

@@ -16,4 +16,5 @@ in
   options.swarselsystems.server.spotifyd = lib.mkEnableOption "enable spotifyd on server";
   options.swarselsystems.server.mpd = lib.mkEnableOption "enable mpd on server";
   options.swarselsystems.server.matrix = lib.mkEnableOption "enable matrix on server";
+  options.swarselsystems.server.nextcloud = lib.mkEnableOption "enable nextcloid on server";
 }

profiles/common/home/emacs.nix

@@ -47,7 +47,7 @@
   };
 
   services.emacs = {
-    enable = false;
+    enable = true;
     # socketActivation.enable = false;
     # startWithUserSession = "graphical";
   };

profiles/common/home/zsh.nix

@@ -65,6 +65,22 @@
                         printf "\e]%s\e\\" "$1"
                       fi
                                }
+        vterm_prompt_end() {
+            vterm_printf "51;A$(whoami)@$(hostname):$(pwd)"
+        }
+        setopt PROMPT_SUBST
+        PROMPT=$PROMPT'%{$(vterm_prompt_end)%}'
+
+        vterm_cmd() {
+          local vterm_elisp
+          vterm_elisp=""
+          while [ $# -gt 0 ]; do
+              vterm_elisp="$vterm_elisp""$(printf '"%s" ' "$(printf "%s" "$1" | sed -e 's|\\|\\\\|g' -e 's|"|\\"|g')")"
+              shift
+          done
+          vterm_printf "51;E$vterm_elisp"
+      }
+
     '';
   };
 }

profiles/common/nixos/default.nix

@@ -35,7 +35,6 @@
     # ./yubikey-touch-detector.nix
     ./safeeyes.nix
     ./lid.nix
-    ./emacs.nix
   ];
 
   nix =

profiles/common/nixos/sops.nix

@@ -47,10 +47,11 @@ in
         WIREGUARDENDPOINT=${config.sops.placeholder.wireguardendpoint}
       '';
       ".authinfo" = {
+        owner = "swarsel";
         path = "${config.users.users.swarsel.home}/.emacs.d/.authinfo";
         content = ''
           machine stash.swarsel.win:443 port https login ${config.sops.placeholder.stashuser} password ${config.sops.placeholder.stashpass}
-          machine gitlab.com/api/v4 login ${config.sops.placeholder.githubforgeuser} password glpat-72Wpzs2uuz--LfNHZFzW ${config.sops.placeholder.githubforgepass}
+          machine gitlab.com/api/v4 login ${config.sops.placeholder.githubforgeuser} password ${config.sops.placeholder.githubforgepass}
           machine api.github.com login ${config.sops.placeholder.gitlabforgeuser} password ${config.sops.placeholder.gitlabforgepass}
         '';
       };

profiles/server/common/default.nix

@@ -19,6 +19,7 @@
     ./spotifyd.nix
     ./mpd.nix
     ./matrix.nix
+    ./nextcloud.nix
   ];
 
   nix =

profiles/server/winters/default.nix

@@ -47,6 +47,7 @@
       spotifyd = true;
       mpd = false;
       matrix = true;
+      nextcloud = true;
     };
   };
 

profiles/server1/nginx/nixos.nix

@@ -70,6 +70,7 @@
     recommendedGzipSettings = true;
     virtualHosts = {
 
+
       "stash.swarsel.win" = {
         enableACME = true;
         forceSSL = true;

programs/emacs/init.el

@@ -1409,6 +1409,8 @@ create a new one."
                            "-o ControlMaster=auto -o ControlPersist=yes"))
   )
 
+(setq vterm-tramp-shells '(("ssh" "'sh'")))
+
 (use-package diff-hl
   :hook
   ((prog-mode
@@ -1861,23 +1863,110 @@ create a new one."
 (use-package vterm
     :ensure t)
 
-(use-package mmm-mode)
+(defun sudo-find-file (file-name)
-(setq mmm-global-mode 'maybe)
+"Like find file, but opens the file as root."
-(mmm-add-mode-ext-class 'org-mode nil 'org-nix)
+(interactive "FSudo Find File: ")
-(mmm-add-mode-ext-class 'org-mode nil 'org-elisp)
+(let ((tramp-file-name (concat "/sudo::" (expand-file-name file-name))))
+  (find-file tramp-file-name)))
+;;; vterm/config.el -*- lexical-binding: t; -*-
 
-(mmm-add-group
+  ;; Original functions overwrites tramp path with a guessed path.
- 'org-nix
+  ;; However it breaks if remote fqdn/hostname is not resolvale by local machine
- '((nix-src-block
+  ;; could also break on port forwarding, multihops,
-    :submode nix-mode
+  ;; custom protocol such as: docker, vagrant, ...
-    :face org-block
+  ;; *if* you try to shell-side configure them.
-    :front "#\\+BEGIN_SRC nix.*\n"
+  ;; Easily testable with vagrant ssh port on localhost.
-    :back "#\\+END_SRC")))
+  ;; My workflow is to open a tramp dired on / of the remote to get a
+  ;; "foothold" then open vterms from there.
+  (defun vterm--get-directory (path)
+    "[OVERLOADED] Get normalized directory to PATH."
+    (when path
+      (let (directory)
+        (if (string-match "^\\(.*?\\)@\\(.*?\\):\\(.*?\\)$" path)
+            (progn
+              (let ((user (match-string 1 path))
+                    (host (match-string 2 path))
+                    (dir (match-string 3 path)))
+                (if (and (string-equal user user-login-name)
+                         (string-equal host (system-name)))
+                    (progn
+                      (when (file-directory-p dir)
+                        (setq directory (file-name-as-directory dir))))
+                  (setq directory
+                        ;; Bellow is what i altered
+                        (file-name-as-directory (concat (file-remote-p default-directory) dir))))))
+          (when (file-directory-p path)
+            (setq directory (file-name-as-directory path))))
+        directory)))
+  ;; Injects the payload to the vterm buffer.
+  (defun me/vterm-load-config ()
+    "Pass local configuration files to vterm.
 
-(mmm-add-group
+Allows remote vterm to be shell-side configured,
- 'org-elisp
+without altering remote config.
- '((elisp-src-block
+Also adds my personal configuration that does not rely
-    :submode emacs-lisp-mode
+too much on external packages.
-    :face org-block
+Prints a reasuring message to proove good faith."
-    :front "#\\+BEGIN_SRC emacs-lisp.*\n"
+    (interactive)
-    :back "#\\+END_SRC")))
+    (let (;; Bellow messages to reassure other users that look at history
+          (reasuring-message (format "Configuring shell of user %s to be emacs comptible"
+                                     user-full-name))
+          (reasuring-notice "This action is shell local, it will not affect other shells")
+          ;; Bellow lies my configuration
+          (basic-func-script (f-read-text (concat (getenv "HOME")
+                                                  "/.emacs.d/shells/sources/functions.sh")))
+          ;; Bellow lies the vterm shell-side configuration
+          ;; Must be sourced last
+          (vterm-func-script (f-read-text (concat
+                                           (file-name-directory (find-library-name "vterm"))
+                                           "/etc/emacs-vterm-bash.sh"))))
+      (vterm-insert (format "# START: %s\n" reasuring-message))
+      (vterm-insert (format "# %s\n" reasuring-notice))
+      ;; Create one single block in history
+      (vterm-insert "{\n")
+      (vterm-insert basic-func-script)
+      (vterm-insert vterm-func-script)
+      (vterm-insert "}\n")
+      ;; End the single block in history
+      (vterm-insert (format "# %s\n" reasuring-notice))
+      (vterm-insert (format "# STOP: %s\n" reasuring-message))
+      )
+    )
+
+  ;; find-file-other-window does not works great on remote:
+  ;; if given an absolute path on a remote host,
+  ;; the path will be understood as a local file since no
+  ;; tramp prefix is present, and bash does not care
+  ;; about tramp prefixes.
+  ;; Bellow we solve context before sending it to
+  ;; ffow
+  (defun me/vterm--find-file-other-window-wrapper (file)
+    "Help vterm find a FILE."
+    (find-file-other-window (me/vterm--ffow-resolver file)))
+  (defun me/vterm--ffow-resolver (file)
+    "Help vterm resolve FILE."
+    (cond
+     ;; "/sudo::"
+     ;; doom--sudo-file-path do the trick for us
+     ((s-starts-with-p "/sudo::" file)
+       (sudo-find-file
+        (concat (file-remote-p default-directory)
+                (substring-no-properties file 7))))
+     ;; "/" means we want the "Relative root"
+     ;; try appending the remote prefix if relevent
+     ((s-starts-with-p "/" file)
+      (concat (file-remote-p default-directory) file))
+     ;; we got a relative path
+     ;; we don't need to help ffow to find it
+     (t
+      file)))
+
+  ;; The variable vterm-eval-cmds is a SERIOUSLY SENSIBLE variable !
+  ;; Do not be the guy that adds RCE into their config !
+
+  ;; Allow customed ffow to be called from vterm
+  ;; ffow should be as safe as find-file which is already trusted
+  ;; we append our resolver that only manipulate strings,
+  ;; Proove me wrong but i think it's safe.
+  (add-to-list 'vterm-eval-cmds '("find-file-other-window"
+                                  me/vterm--find-file-other-window-wrapper))

secrets/server/winters/secrets.yaml

@@ -32,6 +32,7 @@ vpnprot: ENC[AES256_GCM,data:/NV2,iv:wVvlcdisq2PdLeNpaxE7cwBsKEJgoi/MAmWoTgHFMbQ
 vpnloc: ENC[AES256_GCM,data:U8ModKho4vSHnMo9BOE978V6ZlMeQEoLaFW/,iv:Sw06YsWSZ4tGt/TRhRGkU4KdLBcmZTCY4mGqQbpEh7Q=,tag:kDoTkpzXZKEUIa1CSh3Pwg==,type:str]
 #ENC[AES256_GCM,data:yp7ApA4YLSk=,iv:O/SQxKe9EWqExHbeKsTXvbst0pjCxy3yiOjmeCVjmdY=,tag:RMkAOLOLCodnPSDEuImwRw==,type:comment]
 swarseluser: ENC[AES256_GCM,data:XvmOHYFNhb/bAYAZ/kmUWbbmRy/WrxSYri/Y5k+SH4N7ZIjuZDHOkWk93ERFuTb77HvhbPX/NRQraUoJoFsxGGg5co/gJnyfRg==,iv:J50PeDcC4PM3+yQ/YQNb8TW4kubwi2kjjSFU0RVFM30=,tag:ydLYkz1YKyguGZZZD/JcLA==,type:str]
+nextcloudadminpass: ENC[AES256_GCM,data:ZOCsu4/ijfheBfY9ZR5DBXSB,iv:bNlTLKQblnt2eYJqVgXwCaGAyAw2yhlb9Whsz0LBhm4=,tag:VQAWP/b8IghzXDFLJxXZ4Q==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -47,8 +48,8 @@ sops:
             SHJMUFJSeGRQcTIyU1U5RXkvQi9NMzQKm8SP9jQ4fuIuddzqP+m6EJg7+zkX53jz
             bHaMPuLTaIHaaSDlVYe5stpyPDlZQ0NSGWV+HaIXkLZNfNM71hWYBQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-28T12:53:10Z"
+    lastmodified: "2024-10-04T08:36:13Z"
-    mac: ENC[AES256_GCM,data:Nj6hZlzRJyMB7v54hp2rGCBx02vVD/DR+LAB/l9nT4OIIfQ2mUY3IF+lCSZIwMv6ZsupLHKjAjkgbBWJzOFbcMl3bPP8OTU3sR5Gkf3TjmhyCacUWmSQ1jYhs6T9kcFx1ijyBWVo5cdMG8sJQxtvPeTqzRLruzTiLVoSs/H/iqY=,iv:6qPguq8IZZgZt8OG8JcXQeq/aqgrHZVVS/2FRgH1EB8=,tag:i/80H90klVHBR6QAKBTn8Q==,type:str]
+    mac: ENC[AES256_GCM,data:hQv1wB6bajUwKDIDObgbl15zrTjWjjq2ikEzn4WnnZs5ugqfFbNmqbWeadLhHSGjjUHNJy/9zQkM52Q0t2c4KOWY15F+ZcaQvlLB1pYF7zqOAmf1l9ruVOvuegCsFQBT4rZ0Z9XWrt+gacVtfrQa0IPxNyMWEaTHEIsGqfdaCEc=,iv:Kz1Occpgg2dX51v/UF4Ix2Zg60+uZG9oOrXX5T+ElJg=,tag:fg8FaThsSkLYEEniNo7ihg==,type:str]
     pgp:
         - created_at: "2024-09-23T20:03:08Z"
           enc: |-