From 3b91c278e558535afdab0077cf3d60cfa9e8d13b Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Mon, 23 Sep 2019 15:58:40 +0200 Subject: hg/git: Update mail address --- dot.gitconfig | 2 +- dot.hgrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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.hgrc b/dot.hgrc index 25e0a4e..0f3c49f 100644 --- a/dot.hgrc +++ b/dot.hgrc @@ -2,7 +2,7 @@ %include ~/.hgrc.local [ui] -username = Thomas Schneider +username = Thomas Schneider [email] method = sendmail -- cgit v1.2.3 From 63a8254c3b8c20bf590faa5b8e2deb7282f5fdf1 Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Mon, 23 Sep 2019 16:00:15 +0200 Subject: tmux: Copy config to own repo --- dot.tmux.conf | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) mode change 120000 => 100644 dot.tmux.conf diff --git a/dot.tmux.conf b/dot.tmux.conf deleted file mode 120000 index 0a0a96c..0000000 --- a/dot.tmux.conf +++ /dev/null @@ -1 +0,0 @@ -grml-etc-core/etc/tmux.conf \ No newline at end of file diff --git a/dot.tmux.conf b/dot.tmux.conf new file mode 100644 index 0000000..3c36464 --- /dev/null +++ b/dot.tmux.conf @@ -0,0 +1,64 @@ +# Filename: /etc/tmux +# Purpose: configuration file for tmux +# Authors: grml-team (grml.org), (c) Michael Prokop , +# Sebastian Boehm +# Bernhard Tittelbach +# 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 -- cgit v1.2.3 From 2dd35c310229c55c296ef611bd49d1b3a4c773f0 Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Mon, 23 Sep 2019 16:02:01 +0200 Subject: Emacs/AUCTeX: Don’t enable TeX-electric-escape MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dot.emacs.d/init.el | 1 - 1 file changed, 1 deletion(-) diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el index 98f4275..14f5ad2 100644 --- a/dot.emacs.d/init.el +++ b/dot.emacs.d/init.el @@ -242,7 +242,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 -- cgit v1.2.3 From cb92d0b9e3dd3108847d99e98cfe464b5c8af876 Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Mon, 23 Sep 2019 16:06:30 +0200 Subject: Emacs/Gnus: Show X-Spam-Score header --- dot.emacs.d/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el index 14f5ad2..7b90f53 100644 --- a/dot.emacs.d/init.el +++ b/dot.emacs.d/init.el @@ -294,7 +294,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 -- cgit v1.2.3 From c222262c867fa2a07f08a7bae062316bf75a0695 Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Mon, 7 Oct 2019 18:00:26 +0200 Subject: Emacs: Remove flycheck --- dot.emacs.d/init.el | 3 --- 1 file changed, 3 deletions(-) diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el index 7b90f53..cd764f9 100644 --- a/dot.emacs.d/init.el +++ b/dot.emacs.d/init.el @@ -170,9 +170,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) -- cgit v1.2.3 From 82452cc88973ee9e8d752d1d80ee62f483c8526e Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Mon, 7 Oct 2019 18:01:46 +0200 Subject: Emacs: Some company changes --- dot.emacs.d/init.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el index cd764f9..f460ff4 100644 --- a/dot.emacs.d/init.el +++ b/dot.emacs.d/init.el @@ -82,7 +82,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) -- cgit v1.2.3 From ad646e11d555e9556cad46d5d0f381b57ddb0d9c Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Mon, 7 Oct 2019 18:02:07 +0200 Subject: Emacs: Install toml-mode --- dot.emacs.d/init.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el index f460ff4..38f3948 100644 --- a/dot.emacs.d/init.el +++ b/dot.emacs.d/init.el @@ -253,6 +253,8 @@ (auctex-latexmk-setup) (setq TeX-command-default "LatexMk")) +(use-package toml-mode) + (use-package rust-mode :mode "\\.rs\\'") -- cgit v1.2.3 From 86842b92b56548f97fffef391f887e61ce8d287b Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Mon, 7 Oct 2019 18:02:26 +0200 Subject: Emacs: Install cargo-mode --- dot.emacs.d/init.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el index 38f3948..e5a12a3 100644 --- a/dot.emacs.d/init.el +++ b/dot.emacs.d/init.el @@ -257,6 +257,9 @@ (use-package rust-mode :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") -- cgit v1.2.3 From 40dc3fe646d399deec916edc102f892ac4f61574 Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Mon, 7 Oct 2019 18:02:44 +0200 Subject: Emacs: Install lsp and related packages --- dot.emacs.d/init.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el index e5a12a3..889ddb6 100644 --- a/dot.emacs.d/init.el +++ b/dot.emacs.d/init.el @@ -110,12 +110,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)) @@ -256,6 +263,7 @@ (use-package toml-mode) (use-package rust-mode + :hook (rust-mode . lsp) :mode "\\.rs\\'") ;; Add keybindings for interacting with Cargo (use-package cargo -- cgit v1.2.3 From 30849368c34af2c69a50ac6dd9213ab686d42218 Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Mon, 7 Oct 2019 18:06:58 +0200 Subject: Emacs: Remove “install package iff not present on system” hack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dot.emacs.d/init.el | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el index 889ddb6..f5b262e 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)) -- cgit v1.2.3