diff --git a/.bashrc b/.bashrc index 67dd41e..e5a172e 100755 --- a/.bashrc +++ b/.bashrc @@ -13,9 +13,9 @@ esac HISTCONTROL=ignoreboth # allow docker to use X -if [ -f /usr/bin/xhost ]; then - xhost +local:root -fi +# if [ -f /usr/bin/xhost ]; then +# xhost +local:root +# fi # Load the shell dotfiles, and then some: # * ~/.path can be used to extend `$PATH`. @@ -119,9 +119,17 @@ if ! shopt -oq posix; then fi . "$HOME/.cargo/env" -if [ -z "$SSH_AUTH_SOCK" ] ; then - eval `ssh-agent -s` - # ssh-add +ssh-add -l &>/dev/null +if [ "$?" == 2 ]; then + test -r ~/.ssh-agent && \ + eval "$(<~/.ssh-agent)" >/dev/null + + ssh-add -l &>/dev/null + if [ "$?" == 2 ]; then + (umask 066; ssh-agent > ~/.ssh-agent) + eval "$(<~/.ssh-agent)" >/dev/null + ssh-add + fi fi eval "$(starship init bash)" @@ -130,3 +138,12 @@ eval "$(starship init bash)" 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 +# curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + +# pnpm +export PNPM_HOME="/home/fschl/.local/share/pnpm" +export PATH="$PNPM_HOME:$PATH" +# pnpm end \ No newline at end of file diff --git a/.i3/config b/.i3/config index cd8890d..1a9551f 100755 --- a/.i3/config +++ b/.i3/config @@ -108,21 +108,20 @@ set $WS9 "9 " assign [class="^Firefox$"] $WS1 assign [class="^DebugScreen"] $WS3 -assign [class="^Eclipse$"] $WS5 assign [class="^Thunderbird$"] $WS4 assign [class=".*ee.*ass.*"] $WS8 # https://faq.i3wm.org/question/3726/workspace-output-multiple-values/index.html%3Fanswer=3731.html#post-id-3731 -# set $LAPTOP LVDS-1 -set $CENTER DP-0 -set $RIGHT DP-3 -set $LEFT DVI-D-0 +set $LAPTOP LVDS-1 +set $CENTER DP-1 +set $RIGHT VGA-1 +set $LEFT HDMI-1 # monitor settings bindsym $mod+m mode "monitor" mode "monitor" { # only laptop - bindsym 1 exec xrandr --output $LAPTOP --auto --primary --output $CENTER --off $RIGHT --off + bindsym 1 exec xrandr --output $LAPTOP --auto --primary --output $CENTER --off --output $LEFT --off # CENTER main, RIGHT secondary bindsym 2 exec xrandr --output $CENTER --primary --auto --output $LAPTOP --auto --left-of $CENTER --output $RIGHT --off # HDMI main, laptop left, VGA right, *not* supported on X230 @@ -211,9 +210,10 @@ mode "resize" { bindsym $mod+r mode "resize" bar { - font pango:DejaVu Sans, FontAwesome 9 + font pango:DejaVu Sans, FontAwesome 7 # position top - output $CENTER + output $LAPTOP + # output $CENTER status_command /usr/bin/i3status-rs /home/fschl/dotfiles/.i3/status-rust.toml colors { separator #166616 @@ -227,7 +227,7 @@ bar { } bar { - output $RIGHT + # output $RIGHT output $LEFT status_command i3status --config ~/.i3/status_small.conf tray_output $CENTER @@ -235,10 +235,10 @@ bar { # startup programs exec --no-startup-id nm-applet -exec --no-startup-id xrandr --output $CENTER --primary --auto --output $RIGHT --auto --right-of $CENTER --rotate left --output $LAPTOP --off --output $LEFT --auto --left-of $CENTER --rotate right +exec --no-startup-id xrandr --output $LAPTOP --primary --auto --output $RIGHT --auto --right-of $CENTER --rotate left --output $CENTER --off --output $LEFT --auto --left-of $CENTER --rotate right exec --no-startup-id i3-msg 'workspace $WS1; exec firefox;' exec --no-startup-id i3-msg 'workspace $WS2; exec emacs' -exec --no-startup-id i3-msg 'exec thunderbird' +# exec --no-startup-id i3-msg 'exec thunderbird' exec --no-startup-id i3-msg 'exec keepassxc' -exec --no-startup-id i3-msg 'workspace $WS5; exec kitty;' +exec --no-startup-id i3-msg 'workspace $WS3; exec kitty;' diff --git a/.i3/status-rust.toml b/.i3/status-rust.toml index ea6cbb8..d6e11e4 100644 --- a/.i3/status-rust.toml +++ b/.i3/status-rust.toml @@ -1,12 +1,12 @@ [theme] -name = "semi-native" -# theme = "solarized-dark" +# name = "semi-native" +name = "solarized-dark" [theme.overrides] separator = "|" [icons] name = "awesome" - +# https://github.com/greshake/i3status-rust/blob/master/doc/blocks.md [[block]] block = "pomodoro" length = 25 @@ -22,16 +22,16 @@ pomodoro_paused = "⏸" pomodoro_break = "" -# [[block]] -# block = "disk_space" -# path = "/" -# info_type = "available" -# unit = "GB" -# interval = 20 -# warning = 1.5 -# alert = 0.8 -# alert_absolute = true -# format = "{icon}/{available}" +[[block]] +block = "disk_space" +path = "/" +info_type = "available" +unit = "GB" +interval = 20 +warning = 1.5 +alert = 0.4 +alert_absolute = true +format = "{icon}/{available}" [[block]] block = "disk_space" @@ -70,31 +70,32 @@ device = "enp31s0" format = "eth {ip} {speed_down;K*b} {graph_down;K*b}" interval = 5 -# [[block]] -# block = "net" -# device = "wlp3s0" -# on_click = "alacritty -e nmtui" -# format = "{ssid} {signal_strength} {ip} {speed_down;K*b}" -# # format = "{ssid} {signal_strength} {ip} {speed_down;K*b} {graph_down;K*b}" -# interval = 5 +[[block]] +block = "net" +device = "wlp3s0" +# on_click = "kitty -e nmtui" +format = "{ssid} ({signal_strength}) {ip} {speed_down;K*b}" +# format = "{ssid} {signal_strength} {ip} {speed_down;K*b} {graph_down;K*b}" +interval = 5 [[block]] block = "sound" format = "{volume}" show_volume_when_muted = true -# [[block]] -# block = "sound" -# name = "Mic" -# format = "{output_name} {volume}" -# show_volume_when_muted = true +[[block]] +block = "sound" +name = "Capture" +device_kind = "source" +format = "Mic {volume}" +show_volume_when_muted = true -# [[block]] -# block = "battery" -# # driver = "upower" -# driver = "sysfs" -# format = "{percentage} {time}" -# allow_missing = true +[[block]] +block = "battery" +# driver = "upower" +driver = "sysfs" +format = "{percentage} {time}" +allow_missing = true # [[block]] # block = "networkmanager" @@ -108,4 +109,4 @@ show_volume_when_muted = true block = "time" timezone = "Europe/Berlin" interval = 5 -format = "%a %Y-%m-%d %R:%S" +format = "%a %Y-%m-%d (%V) %R:%S" diff --git a/.spacemacs b/.spacemacs index ca1ea22..bb03af9 100644 --- a/.spacemacs +++ b/.spacemacs @@ -32,7 +32,9 @@ This function should only modify configuration layer settings." ;; List of configuration layers to load. dotspacemacs-configuration-layers - '(javascript + '(sql + typescript + javascript systemd ;; ---------------------------------------------------------------- ;; Example of useful layers you may want to use right away. @@ -49,6 +51,7 @@ This function should only modify configuration layer settings." graphviz helm html + ;; (keypoard-layout :variables kl-layout 'colemak-neio-literal) latex (lsp :variables lsp-rust-server @@ -59,6 +62,7 @@ This function should only modify configuration layer settings." org-enable-roam-ui t) plantuml (python :variables python-backend 'lsp python-lsp-server 'mspyls) + restclient (rust :variables rust-backend 'lsp) shell ;; shell-scripts @@ -70,6 +74,7 @@ This function should only modify configuration layer settings." tree-sitter-fold-enable t tree-sitter-fold-indicators-enable t) version-control + (vue :variables vue-backend 'lsp) yaml ;; (shell :variables ;; shell-default-height 30 diff --git a/.ssh/config b/.ssh/config index cc36d42..8cb1e04 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,3 +1,11 @@ +# https://gist.github.com/grenade/6318301 +# +# chmod 700 ~/.ssh +# chmod 644 ~/.ssh/authorized_keys +# chmod 644 ~/.ssh/known_hosts +# chmod 644 ~/.ssh/config +# chmod 600 ~/.ssh/id_rsa +# chmod 644 ~/.ssh/id_rsa.pub # more secure ssh config # https://wiki.mozilla.org/Security/Guidelines/OpenSSH # @@ -9,6 +17,11 @@ IdentitiesOnly yes # make known_hosts unreadable HashKnownHosts yes +# see man ssh-config +AddKeysToAgent yes +IdentityAgent SSH_AUTH_SOCK + + # order HostKeyAlgorithms HostKeyAlgorithms ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa,ecdsa-sha2-nistp521-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256 @@ -20,6 +33,7 @@ Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh. #Host hostname_alias -# User yourusername -# Hostname -# IdentityFile ~/.ssh/ + # Hostname + # Port 22022 + # User yourusername + # IdentityFile ~/.ssh/.pub diff --git a/README.org b/README.org index 521a3e2..48b8390 100644 --- a/README.org +++ b/README.org @@ -102,3 +102,14 @@ - ~multiplib~ is required for wine - Sound troubleshooting: https://wiki.archlinux.org/title/Advanced_Linux_Sound_Architecture/Troubleshooting#HDMI - Skype, VSCode: use ~yay~ + +** NEXT Moving to Guix + +** ImageMagick Notes + +convert multiple .png files into multipage pdf with downscaling +#+begin_src bash + convert filePrefix*.png -resize 1240x1753 \ + -extent 1240x1753 -gravity center \ + -units PixelsPerInch -density 150x150 multipage.pdf +#+end_src diff --git a/publish.el b/publish.el index 014dcd0..dcc2f70 100644 --- a/publish.el +++ b/publish.el @@ -32,6 +32,7 @@ (defun roam-sitemap (title list) (concat "#+OPTIONS: ^:nil author:nil html-postamble:nil\n" "#+SETUPFILE: ./simple_inline.theme\n" + "#+HTML_HEAD_EXTRA: \n" "#+TITLE: " title "\n\n" (org-list-to-org list) "\nfile:sitemap.svg")) @@ -114,11 +115,12 @@ :base-extension "org" :exclude ".stversions/\\|.stfolder" :sitemap-function roam-sitemap - :sitemap-title "Roam notes" + :sitemap-title "Roam Notes" + :style "" :publishing-function roam-publication-wrapper - :publishing-directory "~/projects/blog-fschlde/pkb/" + :publishing-directory "~/projects/fschlde-static/pkb/" :section-number nil - :table-of-contents nil - :style "") + :table-of-contents t + ) ) ) diff --git a/spacemacs-custom.el b/spacemacs-custom.el index eb93a91..0418100 100644 --- a/spacemacs-custom.el +++ b/spacemacs-custom.el @@ -57,9 +57,11 @@ # #+TITLE: ? # #+DATE: -# #+SUBJECT: test letter subject +#+SUBJECT: Betreff des Briefs #+LCO: Absender-Frieder +# #+LCO: Absender-Marcelle +# #+LCO: Absender-FamilieSchlesier #+LCO: Brief-de-modern #+STARTUP: showall @@ -70,7 +72,9 @@ * Sehr geehrte Damen und Herren, ? -* Mit freundlichen Grüßen, :closing: " +* Mit freundlichen Grüßen, :closing: + +Frieder Schlesier" ) ("m" "Schedule a meeting" entry (file+headline "~/Documents/Org/tasks.org")