fix org-capture, ssh-agent, git pull rebase, some aliases

.aliases

@@ -2,10 +2,12 @@ alias ..='cd ..'
 alias ...='cd ../..'
 alias ....='cd ../../..'
 alias .....='cd ../../../..'
-alias rs='rsync --progress -v'
+alias rs='rsync --progress -vur '
 alias up='sudo apt update && sudo apt upgrade'
 alias upnodock='sudo apt-mark hold docker-ce docker-ce-cli && sudo apt update && sudo apt upgrade && sudo apt-mark unhold docker-ce docker-ce-cli'
 
+alias cat='bat'
+alias rg='ripgrep'
 alias ll='ls -ahlF'
 alias la='ls -Ah'
 alias l='ls -CF'
@@ -37,8 +39,9 @@ alias dvl='docker volume ls'
 alias dip="docker container inspect -f '{{ .NetworkSettings.IPAddress }}'" # call with <container name> or ID
 alias dih="docker container inspect -f '{{ .Config.Hostname }}'" # call with <container name> or ID
 alias dstats="docker stats "'$(sudo docker ps -aq)' # shows stats thingy for all containers
-alias drmsc="docker container ls -a | grep Exited | awk '{print $1}' | xargs docker container rm" # removes stopped containers
-alias drmdi="docker image remove "'$(docker image ls -q -f dangling=true)' # removes non-tagged images
+
+alias drmsc="docker container prune"
+alias drmdi="docker image prune"
 
 # docker swarm
 alias dss='docker stack services '

.bashrc

@@ -114,3 +114,14 @@ if ! shopt -oq posix; then
         . /etc/bash_completion
     fi
 fi
+. "$HOME/.cargo/env"
+
+if [ -z "$SSH_AUTH_SOCK" ] ; then
+    eval `ssh-agent -s`
+    # ssh-add
+fi
+
+
+# BEGIN_KITTY_SHELL_INTEGRATION
+if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
+# END_KITTY_SHELL_INTEGRATION

.gitconfig

@@ -27,3 +27,5 @@
     helper = cache
 [color]
     ui = true
+[pull]
+	rebase = true

.spacemacs

@@ -54,7 +54,6 @@ This function should only modify configuration layer settings."
           org-enable-roam-support t)
      plantuml
      python
-     ranger
      rust
      shell
      shell-scripts
@@ -248,9 +247,9 @@ It should only modify the values of Spacemacs settings."
    dotspacemacs-default-font '("DejaVu Sans Mono"
                                :size 11
                                :weight normal
-                               :width normal
-                               :powerline-scale 1.0)
-   ;; The leader key
+                               :width normal)
+
+   ;; The leader key (default "SPC")
    dotspacemacs-leader-key "SPC"
 
    ;; The key used for Emacs commands `M-x' (after pressing on the leader key).
@@ -469,7 +468,7 @@ It should only modify the values of Spacemacs settings."
    ;; performance issues, instead of calculating the frame title by
    ;; `spacemacs/title-prepare' all the time.
    ;; (default "%I@%S")
-   dotspacemacs-frame-title-format "%I@%S"
+   dotspacemacs-frame-title-format "%I@%t %f (%p)"
 
    ;; Format specification for setting the icon title format
    ;; (default nil - same as frame-title-format)
@@ -516,7 +515,7 @@ It should only modify the values of Spacemacs settings."
    dotspacemacs-home-shorten-agenda-source nil
 
    ;; If non-nil then byte-compile some of Spacemacs files.
-   dotspacemacs-byte-compile t))
+   dotspacemacs-byte-compile nil))
 
 (defun dotspacemacs/user-env ()
   "Environment variables setup.
@@ -563,33 +562,47 @@ you should place your code here."
     (setq org-agenda-files
           (quote ("~/Documents/Org/tasks.org"
                   "~/Documents/Org/journal.org"
+                  "~/Documents/Org/private.org"
                   "~/Documents/Org/projects.org"
                   "~/Documents/Org/watchlist.org"
                   "~/Documents/Org/birthdays.org")))
+
+    (defun fschl/create-org-letter ()
+      "Create a new letter in ~/Documents/letters/ with filename and date"
+      (interactive)
+      (let ((name (read-string "Filename: ")))
+        (expand-file-name (format "%s.org" name) "~/Documents/letters/") ))
+
     (setq org-capture-templates
           '(("t" "todo list item"           ; name
              entry                          ; type
-             (file+headline org-default-notes-file "Tasks")
+             (file org-default-notes-file "Tasks")
              "* TODO %?\n DEADLINE: %^T")  ; template
             ("T" "todo list item with source" ; name
              entry                          ; type
-             (file+headline org-default-notes-file "Tasks")
+             (file org-default-notes-file "Tasks")
              "* TODO %?\n %a \n DEADLINE: %^T \n %i") ; template
+            ("l" "letter to Documents/letters/<datetime.org>"
+             entry (file fschl/create-org-letter)
+             "* %? \n\n * \n\n ")
 
-            ("m" "scheduled meeting"        ; name
-             entry                          ; type
+            ("m" "Schedule a meeting"
+             entry
              (file+headline org-default-notes-file "Tasks")
              "* MEETING %?\n SCHEDULED: %^T\n %a") ; template
 
-            ("p" "phone call"               ; name
-             entry                          ; type
-             (file+headline org-default-notes-file "Tasks")
-             "* PHONE %?\n %i\n %a")        ; template
-
-            ("a" "Articles"
+            ("p" "Schedule a phone call"
              entry
-             (file+weektree "~/Documents/Org/journal.org")
-             "* %? \n%x \n %u\n- $?")
+             (file org-default-notes-file "Tasks")
+             "* PHONE %?\n SCHEDULED: %^T\\n %a")
+
+            ("a" "Articles: keep notes of online articles"
+             entry
+             (file+datetree "~/Documents/Org/journal.org")
+             "* %? \n%x \n %u\n- $?"
+             :tree-type month
+             :kill-buffer t
+             :empty-lines-before 1)
             )
           )