summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accounts/gkleen@sif/default.nix7
-rw-r--r--accounts/gkleen@sif/emacs.el21
-rw-r--r--accounts/gkleen@sif/firefox-chrome.css1
-rw-r--r--accounts/gkleen@sif/ssh-hosts.nix27
4 files changed, 49 insertions, 7 deletions
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 {
136 KbdInteractiveAuthentication yes 136 KbdInteractiveAuthentication yes
137 UpdateHostKeys yes 137 UpdateHostKeys yes
138 GlobalKnownHostsFile ${pkgs.writeText "ssh_known_hosts" '' 138 GlobalKnownHostsFile ${pkgs.writeText "ssh_known_hosts" ''
139 @cert-authority *.mathinst.loc ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUTFpVCdETCXiDSDl7YGbR1J4BLTsoBzjDtflHJGO/z ssh-pki@mgmt01 139 @cert-authority *.mathinst.loc,*.math.lmu.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUTFpVCdETCXiDSDl7YGbR1J4BLTsoBzjDtflHJGO/z ssh-pki@mgmt01
140 ''} 140 ''}
141 141
142 Match host *.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null" 142 Match host *.mathinst.loc,*.math.lmu.de !host ssh.math.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null"
143 # ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118 143 # ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118
144 ProxyJump ssh.math.lmu.de 144 ProxyJump ssh.math.lmu.de
145 145
@@ -165,7 +165,8 @@ in {
165 fira-code-mode use-package wanderlust # notmuch 165 fira-code-mode use-package wanderlust # notmuch
166 use-package-ensure-system-package git-gutter emacsScratch 166 use-package-ensure-system-package git-gutter emacsScratch
167 edit-server mediawiki editorconfig typescript-mode 167 edit-server mediawiki editorconfig typescript-mode
168 markdown-mode nftables-mode 168 markdown-mode nftables-mode rustic lsp-mode lsp-ui
169 direnv company projectile
169 ]; 170 ];
170 }; 171 };
171 firefox = { 172 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 @@
79 ) 79 )
80(add-hook 'js-mode-hook 'my-js-mode-hook) 80(add-hook 'js-mode-hook 'my-js-mode-hook)
81 81
82(defun anansi-mode-hook ()
83 (setq indent-tabs-mode nil)
84 )
85(define-derived-mode anansi-mode 82(define-derived-mode anansi-mode
86 markdown-mode "Anansi" 83 markdown-mode "Anansi"
87 "Major mode for anansi" 84 "Major mode for anansi"
88 'anansi-mode-hook) 85 (lambda () (setq indent-tabs-mode nil)))
89(add-to-list 'auto-mode-alist '("\\.anansi\\'" . anansi-mode)) 86(add-to-list 'auto-mode-alist '("\\.anansi\\'" . anansi-mode))
90 87
88(projectile-mode +1)
89(define-key projectile-mode-map (kbd "s-p") 'projectile-command-map)
90
91(add-hook 'rustic-mode-hook (lambda () (setq indent-tabs-mode nil)))
92(add-hook 'rustic-mode-hook #'lsp-deferred)
93(add-hook 'rustic-mode-hook (lambda () (setq lsp-ui-sideline-enable nil)))
94(setq lsp-auto-guess-root t)
95(setq lsp-inlay-hint-enable t)
96;; (add-hook 'rust-mode-hook 'lsp-inlay-hints-mode)
97(setq lsp-rust-analyzer-server-display-inlay-hints t)
98(setq lsp-rust-analyzer-inlay-hints-mode t)
99(setq lsp-rust-analyzer-display-parameter-hints t)
100(setq lsp-rust-analyzer-display-chaining-hints t)
101(setq lsp-rust-analyzer-hide-named-constructor nil)
102
91(setq undo-tree-auto-save-history t) 103(setq undo-tree-auto-save-history t)
92 104
93(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"))) 105(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 @@
156(customize-set-variable 'tramp-use-ssh-controlmaster-options nil) 168(customize-set-variable 'tramp-use-ssh-controlmaster-options nil)
157(setq tramp-allow-unsafe-temporary-files t) 169(setq tramp-allow-unsafe-temporary-files t)
158 170
171(direnv-mode)
159(setq direnv-enabled-hosts '("uni2work-dev1")) 172(setq direnv-enabled-hosts '("uni2work-dev1"))
160 173
161(setq auth-sources '()) 174(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 @@
23} 23}
24 24
25#sidebar-box[sidebarcommand="tabcenter-reborn_ariasuni-sidebar-action"] #sidebar-header { visibility: collapse !important; } 25#sidebar-box[sidebarcommand="tabcenter-reborn_ariasuni-sidebar-action"] #sidebar-header { visibility: collapse !important; }
26#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 @@
325 ServerAliveInterval = "2"; 325 ServerAliveInterval = "2";
326 }; 326 };
327 }; 327 };
328 "vrt-kvm06" =
329 { hostname = "vrt-kvm06";
330 proxyJump = "mathw0e";
331 user = "root";
332 extraOptions = {
333 PasswordAuthentication = "yes";
334 KbdInteractiveAuthentication = "yes";
335 };
336 };
337 "vrt-kvm05" =
338 { hostname = "vrt-kvm05";
339 proxyJump = "mathw0e";
340 user = "root";
341 extraOptions = {
342 PasswordAuthentication = "yes";
343 KbdInteractiveAuthentication = "yes";
344 };
345 };
328 "vrt-kvm04" = 346 "vrt-kvm04" =
329 { hostname = "vrt-kvm04"; 347 { hostname = "vrt-kvm04";
330 proxyJump = "mathw0e"; 348 proxyJump = "mathw0e";
@@ -437,6 +455,15 @@
437 proxyJump = "mgmt01"; 455 proxyJump = "mgmt01";
438 user = "root"; 456 user = "root";
439 }; 457 };
458 "rdp-lb01" =
459 { hostname = "rdp-lb01.mathinst.loc";
460 proxyJump = "mgmt01";
461 user = "root";
462 };
463 "ssh01" = { hostname = "ssh01.mathinst.loc"; proxyJump = "mgmt01"; };
464 "ssh02" = { hostname = "ssh02.mathinst.loc"; proxyJump = "mgmt01"; };
465 "rdlx01" = { hostname = "rdlx01.mathinst.loc"; proxyJump = "mgmt01"; };
466 "rdlx02" = { hostname = "rdlx02.mathinst.loc"; proxyJump = "mgmt01"; };
440 "math0d" = 467 "math0d" =
441 { hostname = "math0d.mathinst.loc"; 468 { hostname = "math0d.mathinst.loc";
442 proxyJump = "mathw0h"; 469 proxyJump = "mathw0h";