Merge remote-tracking branch 'origin/main' into neptun

3 files changed, 83 insertions, 28 deletions

diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el
index 7d4ff3d..86664e8 100644
--- a/dot.emacs.d/init.el
+++ b/dot.emacs.d/init.el
@@ -5,30 +5,11 @@
 	("gnu" . "https://elpa.gnu.org/packages/")))
 (package-initialize)
 
-(defun qsx-use-package-ensure (name args _state &optional _no-refresh)
-  (dolist (ensure args)
-    (let ((package
-	   (or (and (eq ensure t) (use-package-as-symbol name))
-	       ensure)))
-      (when package
-	(if (and (file-exists-p "/etc/gentoo-release")
-		 (memq package
-		      '(auctex
-			bison-mode
-			company
-			crontab-mode
-			magit
-			markdown-mode
-			rust-mode
-			yaml-mode)))
-	    t
-	  (use-package-ensure-elpa name args _state _no-refresh))))))
 (unless (package-installed-p 'use-package)
   (package-refresh-contents)
   (package-install 'use-package t))
 (require 'use-package)
-(setq use-package-ensure-function #'qsx-use-package-ensure
-      use-package-always-ensure t)
+(setq use-package-always-ensure t)
 
 (defvar --backup-directory (concat user-emacs-directory "backups"))
 (if (not (file-exists-p --backup-directory))
@@ -82,7 +63,9 @@
   :bind (:map company-mode-map
 	      ([remap completion-at-point] . #'company-complete))
   :config
-  (global-company-mode))
+  (global-company-mode)
+  (setq company-tooltip-align-annotations t
+	company-minimum-prefix-length 1))
 (use-package company-math
   :config
   (add-to-list 'company-backends 'company-math-symbols-unicode)
@@ -108,12 +91,19 @@
   :config (add-to-list 'company-backends 'company-ansible))
 (use-package company-shell
   :config (add-to-list 'company-backends '(company-shell company-shell-env)))
+(use-package company-lsp)
 
 (semantic-mode 1)
 (use-package srefactor
   :bind (:map c-mode-map
 	      ("M-RET" . #'srefactor-refactor-at-point)))
 
+(use-package lsp-mode
+  :commands lsp
+  :config (require 'lsp-clients))
+
+(use-package lsp-ui)
+
 (use-package mercurial
   :ensure nil
   :bind-keymap ("C-c H" . hg-global-map))
@@ -170,9 +160,6 @@
   :bind (:map message-mode-map
               ("C-c TAB" . vdirel-helm-select-email)))
 
-(use-package flycheck
-  :init (global-flycheck-mode))
-
 (use-package apache-mode)
 
 (use-package meson-mode)
@@ -242,7 +229,6 @@
   :config
   (setq TeX-auto-save nil
 	TeX-parse-self t
-	TeX-electric-escape t
 	;; TeX-fold-mode
 	font-latex-fontify-sectioning 'color
 	font-latex-fontify-script 'multi-level
@@ -255,8 +241,14 @@
   (auctex-latexmk-setup)
   (setq TeX-command-default "LatexMk"))
 
+(use-package toml-mode)
+
 (use-package rust-mode
+  :hook (rust-mode . lsp)
   :mode "\\.rs\\'")
+;; Add keybindings for interacting with Cargo
+(use-package cargo
+  :hook (rust-mode . cargo-minor-mode))
 
 (setq tramp-default-method "ssh"
       tramp-terminal-type "tramp")
@@ -295,7 +287,7 @@
    gnus-summary-line-format "%U%R %&user-date; %(%[%5k: %-23,23f%]%)%B%s\n"
    gnus-sum-thread-tree-single-indent "  "
    gnus-sorted-header-list '("^From:" "^Organization:" "^Sender:" "^To:" "^Newsgroups:" "^.?Cc:" "^Subject:" "^Date:" "^Resent-.*:" "^Reply-To:" "^Followup-To:" "^X-Clacks-Overhead:" "Openpgp:" "^Authentication-Results:" "^Message-ID:")
-   gnus-visible-headers "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^Followup-To:\\|^Reply-To:\\|^Organization:\\|^Summary:\\|^Keywords:\\|^To:\\|^[BGF]?Cc:\\|^Posted-To:\\|^Mail-Copies-To:\\|^Mail-Followup-To:\\|^Apparently-To:\\|^Gnus-Warning:\\|^Resent-From:\\|^Message-ID:\\|^Authentication-Results:\\|^Sender:\\|^Resent-.*:\\|^X-Clacks-Overhead:\\|^Openpgp:\\|^User-Agent:\\|X-Mailer:\\|^List-Id:"
+   gnus-visible-headers "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^Followup-To:\\|^Reply-To:\\|^Organization:\\|^Summary:\\|^Keywords:\\|^To:\\|^[BGF]?Cc:\\|^Posted-To:\\|^Mail-Copies-To:\\|^Mail-Followup-To:\\|^Apparently-To:\\|^Gnus-Warning:\\|^Resent-From:\\|^Message-ID:\\|^Authentication-Results:\\|^Sender:\\|^Resent-.*:\\|^X-Clacks-Overhead:\\|^Openpgp:\\|^User-Agent:\\|X-Mailer:\\|^List-Id:\\|^X-Spam-Score:"
    mm-verify-option 'known
    mml-secure-smime-encrypt-to-self t
    mml-secure-smime-sign-with-sender t
diff --git a/dot.gitconfig b/dot.gitconfig
index 0c30f9b..c2ffede 100644
--- a/dot.gitconfig
+++ b/dot.gitconfig
@@ -1,7 +1,7 @@
 [include]
 	path = ~/.dotfiles/grml-etc-core/etc/skel/.gitconfig
 [user]
-	email = qsx@qsx.re
+	email = qsx@chaotikum.eu
 	name = Thomas Schneider
 	signingkey = 95ee94a432583db1
 [alias]
diff --git a/dot.tmux.conf b/dot.tmux.conf
index 0a0a96c..3c36464 120000..100644
--- a/dot.tmux.conf
+++ b/dot.tmux.conf
@@ -1 +1,64 @@
-grml-etc-core/etc/tmux.conf
\ No newline at end of file
+# Filename:      /etc/tmux
+# Purpose:       configuration file for tmux
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika at grml.org>,
+#                Sebastian Boehm <sebastian at sometimesfood.org>
+#                Bernhard Tittelbach <xro at realraum.at>
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2.
+################################################################################
+
+### screen-like keybindings
+unbind C-b
+set -g prefix C-a
+bind-key a send-prefix
+bind-key C-a last-window
+unbind space
+bind-key space next-window
+bind-key C-space next-window
+bind-key K confirm-before kill-pane
+bind-key \ confirm-before kill-session
+#bind-key C-h previous-window
+
+### join the last active pane to the currently active window
+bind-key j join-pane -s !
+
+### Move current window to session named "bg" (and create session if it does not exist)
+bind-key B if-shell "! tmux has-session -t bg" "new-session -d -s bg" \; move-window -t bg
+
+### Reload Config
+bind-key R source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded"
+
+###rebind keys
+bind-key h next-layout
+bind-key BSpace previous-window
+
+bind-key tab select-pane -t :.+
+### useful custom keybindings
+bind-key | command-prompt -p "exec:" "split-window -h '%%'"
+bind-key - command-prompt -p "exec:" "split-window -v '%%'"
+
+### misc options
+set -s escape-time 0
+set -g default-terminal "screen-256color"
+set -g display-panes-time 3000
+set -g visual-activity on
+set -g mode-keys vi
+
+### set status line appearance
+set -g status-style fg=white,bg=black
+
+set -g status-left-length 28
+### status-left:  @hostname:sessionname
+set -g status-left "#[fg=white]@#h#[fg=red]:#S#[fg=white] |"
+### status-left:  username@hostname:sessionname
+#set -g status-left "#[fg=blue]#(echo ${USER})#[fg=white]@#h#[fg=red]:#S#[fg=white] |"
+
+### status-right: Date and Time
+set -g status-right-length 16
+set -g status-right '#[fg=yellow]%Y-%m-%d %H:%M'
+### status-right: Time
+#set -g status-right-length 6
+#set -g status-right "#[fg=yellow]%H:%M"
+
+set-window-option -g window-status-style fg=blue,bg=black
+set-window-option -g window-status-current-style bold