From 7b8d1bdc62c5fc3feacfe23fd1eefe85f05b878d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 13 Feb 2024 08:53:55 +0100
Subject: ...
---
accounts/gkleen@sif/default.nix | 7 ++++---
accounts/gkleen@sif/emacs.el | 21 +++++++++++++++++----
accounts/gkleen@sif/firefox-chrome.css | 1 +
accounts/gkleen@sif/ssh-hosts.nix | 27 +++++++++++++++++++++++++++
4 files changed, 49 insertions(+), 7 deletions(-)
(limited to 'accounts')
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 17191407..d40b1c92 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -136,10 +136,10 @@ in {
KbdInteractiveAuthentication yes
UpdateHostKeys yes
GlobalKnownHostsFile ${pkgs.writeText "ssh_known_hosts" ''
- @cert-authority *.mathinst.loc ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUTFpVCdETCXiDSDl7YGbR1J4BLTsoBzjDtflHJGO/z ssh-pki@mgmt01
+ @cert-authority *.mathinst.loc,*.math.lmu.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUTFpVCdETCXiDSDl7YGbR1J4BLTsoBzjDtflHJGO/z ssh-pki@mgmt01
''}
- Match host *.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
+ Match host *.mathinst.loc,*.math.lmu.de !host ssh.math.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null"
# ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118
ProxyJump ssh.math.lmu.de
@@ -165,7 +165,8 @@ in {
fira-code-mode use-package wanderlust # notmuch
use-package-ensure-system-package git-gutter emacsScratch
edit-server mediawiki editorconfig typescript-mode
- markdown-mode nftables-mode
+ markdown-mode nftables-mode rustic lsp-mode lsp-ui
+ direnv company projectile
];
};
firefox = {
diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el
index a2288bf9..0eed3bce 100644
--- a/accounts/gkleen@sif/emacs.el
+++ b/accounts/gkleen@sif/emacs.el
@@ -79,15 +79,27 @@
)
(add-hook 'js-mode-hook 'my-js-mode-hook)
-(defun anansi-mode-hook ()
- (setq indent-tabs-mode nil)
- )
(define-derived-mode anansi-mode
markdown-mode "Anansi"
"Major mode for anansi"
- 'anansi-mode-hook)
+ (lambda () (setq indent-tabs-mode nil)))
(add-to-list 'auto-mode-alist '("\\.anansi\\'" . anansi-mode))
+(projectile-mode +1)
+(define-key projectile-mode-map (kbd "s-p") 'projectile-command-map)
+
+(add-hook 'rustic-mode-hook (lambda () (setq indent-tabs-mode nil)))
+(add-hook 'rustic-mode-hook #'lsp-deferred)
+(add-hook 'rustic-mode-hook (lambda () (setq lsp-ui-sideline-enable nil)))
+(setq lsp-auto-guess-root t)
+(setq lsp-inlay-hint-enable t)
+;; (add-hook 'rust-mode-hook 'lsp-inlay-hints-mode)
+(setq lsp-rust-analyzer-server-display-inlay-hints t)
+(setq lsp-rust-analyzer-inlay-hints-mode t)
+(setq lsp-rust-analyzer-display-parameter-hints t)
+(setq lsp-rust-analyzer-display-chaining-hints t)
+(setq lsp-rust-analyzer-hide-named-constructor nil)
+
(setq undo-tree-auto-save-history t)
(defvar expand-file-name-custom-tilde-alist '(("u2w-srv01" . "/ssh:srv01.uniworx.de:/home/gkleen/projects/uni2work") ("fra-srv01" . "/ssh:srv01.uniworx.de:/home/gkleen/projects/fradrive")))
@@ -156,6 +168,7 @@
(customize-set-variable 'tramp-use-ssh-controlmaster-options nil)
(setq tramp-allow-unsafe-temporary-files t)
+(direnv-mode)
(setq direnv-enabled-hosts '("uni2work-dev1"))
(setq auth-sources '())
diff --git a/accounts/gkleen@sif/firefox-chrome.css b/accounts/gkleen@sif/firefox-chrome.css
index 2d359771..8900e2b9 100644
--- a/accounts/gkleen@sif/firefox-chrome.css
+++ b/accounts/gkleen@sif/firefox-chrome.css
@@ -23,3 +23,4 @@
}
#sidebar-box[sidebarcommand="tabcenter-reborn_ariasuni-sidebar-action"] #sidebar-header { visibility: collapse !important; }
+#sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] #sidebar-header { visibility: collapse !important; }
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index 7bd6bdfe..8cc0f04e 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -325,6 +325,24 @@
ServerAliveInterval = "2";
};
};
+ "vrt-kvm06" =
+ { hostname = "vrt-kvm06";
+ proxyJump = "mathw0e";
+ user = "root";
+ extraOptions = {
+ PasswordAuthentication = "yes";
+ KbdInteractiveAuthentication = "yes";
+ };
+ };
+ "vrt-kvm05" =
+ { hostname = "vrt-kvm05";
+ proxyJump = "mathw0e";
+ user = "root";
+ extraOptions = {
+ PasswordAuthentication = "yes";
+ KbdInteractiveAuthentication = "yes";
+ };
+ };
"vrt-kvm04" =
{ hostname = "vrt-kvm04";
proxyJump = "mathw0e";
@@ -437,6 +455,15 @@
proxyJump = "mgmt01";
user = "root";
};
+ "rdp-lb01" =
+ { hostname = "rdp-lb01.mathinst.loc";
+ proxyJump = "mgmt01";
+ user = "root";
+ };
+ "ssh01" = { hostname = "ssh01.mathinst.loc"; proxyJump = "mgmt01"; };
+ "ssh02" = { hostname = "ssh02.mathinst.loc"; proxyJump = "mgmt01"; };
+ "rdlx01" = { hostname = "rdlx01.mathinst.loc"; proxyJump = "mgmt01"; };
+ "rdlx02" = { hostname = "rdlx02.mathinst.loc"; proxyJump = "mgmt01"; };
"math0d" =
{ hostname = "math0d.mathinst.loc";
proxyJump = "mathw0h";
--
cgit v1.2.3