updates (before move to guix home)

This commit is contained in:
Frieder Schlesier 2024-02-26 13:11:26 +01:00
parent e01c87419e
commit 5f7113ec21
8 changed files with 114 additions and 60 deletions

29
.bashrc
View File

@ -13,9 +13,9 @@ esac
HISTCONTROL=ignoreboth HISTCONTROL=ignoreboth
# allow docker to use X # allow docker to use X
if [ -f /usr/bin/xhost ]; then # if [ -f /usr/bin/xhost ]; then
xhost +local:root # xhost +local:root
fi # fi
# Load the shell dotfiles, and then some: # Load the shell dotfiles, and then some:
# * ~/.path can be used to extend `$PATH`. # * ~/.path can be used to extend `$PATH`.
@ -119,9 +119,17 @@ if ! shopt -oq posix; then
fi fi
. "$HOME/.cargo/env" . "$HOME/.cargo/env"
if [ -z "$SSH_AUTH_SOCK" ] ; then ssh-add -l &>/dev/null
eval `ssh-agent -s` if [ "$?" == 2 ]; then
# ssh-add 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 fi
eval "$(starship init bash)" 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 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 # 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

View File

@ -108,21 +108,20 @@ set $WS9 "9 "
assign [class="^Firefox$"] $WS1 assign [class="^Firefox$"] $WS1
assign [class="^DebugScreen"] $WS3 assign [class="^DebugScreen"] $WS3
assign [class="^Eclipse$"] $WS5
assign [class="^Thunderbird$"] $WS4 assign [class="^Thunderbird$"] $WS4
assign [class=".*ee.*ass.*"] $WS8 assign [class=".*ee.*ass.*"] $WS8
# https://faq.i3wm.org/question/3726/workspace-output-multiple-values/index.html%3Fanswer=3731.html#post-id-3731 # https://faq.i3wm.org/question/3726/workspace-output-multiple-values/index.html%3Fanswer=3731.html#post-id-3731
# set $LAPTOP LVDS-1 set $LAPTOP LVDS-1
set $CENTER DP-0 set $CENTER DP-1
set $RIGHT DP-3 set $RIGHT VGA-1
set $LEFT DVI-D-0 set $LEFT HDMI-1
# monitor settings # monitor settings
bindsym $mod+m mode "monitor" bindsym $mod+m mode "monitor"
mode "monitor" { mode "monitor" {
# only laptop # 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 # CENTER main, RIGHT secondary
bindsym 2 exec xrandr --output $CENTER --primary --auto --output $LAPTOP --auto --left-of $CENTER --output $RIGHT --off 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 # HDMI main, laptop left, VGA right, *not* supported on X230
@ -211,9 +210,10 @@ mode "resize" {
bindsym $mod+r mode "resize" bindsym $mod+r mode "resize"
bar { bar {
font pango:DejaVu Sans, FontAwesome 9 font pango:DejaVu Sans, FontAwesome 7
# position top # position top
output $CENTER output $LAPTOP
# output $CENTER
status_command /usr/bin/i3status-rs /home/fschl/dotfiles/.i3/status-rust.toml status_command /usr/bin/i3status-rs /home/fschl/dotfiles/.i3/status-rust.toml
colors { colors {
separator #166616 separator #166616
@ -227,7 +227,7 @@ bar {
} }
bar { bar {
output $RIGHT # output $RIGHT
output $LEFT output $LEFT
status_command i3status --config ~/.i3/status_small.conf status_command i3status --config ~/.i3/status_small.conf
tray_output $CENTER tray_output $CENTER
@ -235,10 +235,10 @@ bar {
# startup programs # startup programs
exec --no-startup-id nm-applet 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 $WS1; exec firefox;'
exec --no-startup-id i3-msg 'workspace $WS2; exec emacs' 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 'exec keepassxc'
exec --no-startup-id i3-msg 'workspace $WS5; exec kitty;' exec --no-startup-id i3-msg 'workspace $WS3; exec kitty;'

View File

@ -1,12 +1,12 @@
[theme] [theme]
name = "semi-native" # name = "semi-native"
# theme = "solarized-dark" name = "solarized-dark"
[theme.overrides] [theme.overrides]
separator = "<span font='5'>|</span>" separator = "<span font='5'>|</span>"
[icons] [icons]
name = "awesome" name = "awesome"
# https://github.com/greshake/i3status-rust/blob/master/doc/blocks.md
[[block]] [[block]]
block = "pomodoro" block = "pomodoro"
length = 25 length = 25
@ -22,16 +22,16 @@ pomodoro_paused = "⏸"
pomodoro_break = "" pomodoro_break = ""
# [[block]] [[block]]
# block = "disk_space" block = "disk_space"
# path = "/" path = "/"
# info_type = "available" info_type = "available"
# unit = "GB" unit = "GB"
# interval = 20 interval = 20
# warning = 1.5 warning = 1.5
# alert = 0.8 alert = 0.4
# alert_absolute = true alert_absolute = true
# format = "{icon}/{available}" format = "{icon}/{available}"
[[block]] [[block]]
block = "disk_space" block = "disk_space"
@ -70,31 +70,32 @@ device = "enp31s0"
format = "eth {ip} {speed_down;K*b} {graph_down;K*b}" format = "eth {ip} {speed_down;K*b} {graph_down;K*b}"
interval = 5 interval = 5
# [[block]] [[block]]
# block = "net" block = "net"
# device = "wlp3s0" device = "wlp3s0"
# on_click = "alacritty -e nmtui" # on_click = "kitty -e nmtui"
# format = "{ssid} {signal_strength} {ip} {speed_down;K*b}" format = "{ssid} ({signal_strength}) {ip} {speed_down;K*b}"
# # format = "{ssid} {signal_strength} {ip} {speed_down;K*b} {graph_down;K*b}" # format = "{ssid} {signal_strength} {ip} {speed_down;K*b} {graph_down;K*b}"
# interval = 5 interval = 5
[[block]] [[block]]
block = "sound" block = "sound"
format = "{volume}" format = "{volume}"
show_volume_when_muted = true show_volume_when_muted = true
# [[block]] [[block]]
# block = "sound" block = "sound"
# name = "Mic" name = "Capture"
# format = "{output_name} {volume}" device_kind = "source"
# show_volume_when_muted = true format = "Mic {volume}"
show_volume_when_muted = true
# [[block]] [[block]]
# block = "battery" block = "battery"
# # driver = "upower" # driver = "upower"
# driver = "sysfs" driver = "sysfs"
# format = "{percentage} {time}" format = "{percentage} {time}"
# allow_missing = true allow_missing = true
# [[block]] # [[block]]
# block = "networkmanager" # block = "networkmanager"
@ -108,4 +109,4 @@ show_volume_when_muted = true
block = "time" block = "time"
timezone = "Europe/Berlin" timezone = "Europe/Berlin"
interval = 5 interval = 5
format = "%a %Y-%m-%d %R:%S" format = "%a %Y-%m-%d (%V) %R:%S"

View File

@ -32,7 +32,9 @@ This function should only modify configuration layer settings."
;; List of configuration layers to load. ;; List of configuration layers to load.
dotspacemacs-configuration-layers dotspacemacs-configuration-layers
'(javascript '(sql
typescript
javascript
systemd systemd
;; ---------------------------------------------------------------- ;; ----------------------------------------------------------------
;; Example of useful layers you may want to use right away. ;; Example of useful layers you may want to use right away.
@ -49,6 +51,7 @@ This function should only modify configuration layer settings."
graphviz graphviz
helm helm
html html
;; (keypoard-layout :variables kl-layout 'colemak-neio-literal)
latex latex
(lsp :variables (lsp :variables
lsp-rust-server lsp-rust-server
@ -59,6 +62,7 @@ This function should only modify configuration layer settings."
org-enable-roam-ui t) org-enable-roam-ui t)
plantuml plantuml
(python :variables python-backend 'lsp python-lsp-server 'mspyls) (python :variables python-backend 'lsp python-lsp-server 'mspyls)
restclient
(rust :variables rust-backend 'lsp) (rust :variables rust-backend 'lsp)
shell shell
;; shell-scripts ;; shell-scripts
@ -70,6 +74,7 @@ This function should only modify configuration layer settings."
tree-sitter-fold-enable t tree-sitter-fold-enable t
tree-sitter-fold-indicators-enable t) tree-sitter-fold-indicators-enable t)
version-control version-control
(vue :variables vue-backend 'lsp)
yaml yaml
;; (shell :variables ;; (shell :variables
;; shell-default-height 30 ;; shell-default-height 30

View File

@ -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 # more secure ssh config
# https://wiki.mozilla.org/Security/Guidelines/OpenSSH # https://wiki.mozilla.org/Security/Guidelines/OpenSSH
# #
@ -9,6 +17,11 @@ IdentitiesOnly yes
# make known_hosts unreadable # make known_hosts unreadable
HashKnownHosts yes HashKnownHosts yes
# see man ssh-config
AddKeysToAgent yes
IdentityAgent SSH_AUTH_SOCK
# order HostKeyAlgorithms # 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 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 #Host hostname_alias
# User yourusername # Hostname <IP or dns>
# Hostname <IP or dns> # Port 22022
# IdentityFile ~/.ssh/<your_keyfile_name> # User yourusername
# IdentityFile ~/.ssh/<your_keyfile_name>.pub

View File

@ -102,3 +102,14 @@
- ~multiplib~ is required for wine - ~multiplib~ is required for wine
- Sound troubleshooting: https://wiki.archlinux.org/title/Advanced_Linux_Sound_Architecture/Troubleshooting#HDMI - Sound troubleshooting: https://wiki.archlinux.org/title/Advanced_Linux_Sound_Architecture/Troubleshooting#HDMI
- Skype, VSCode: use ~yay~ - 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

View File

@ -32,6 +32,7 @@
(defun roam-sitemap (title list) (defun roam-sitemap (title list)
(concat "#+OPTIONS: ^:nil author:nil html-postamble:nil\n" (concat "#+OPTIONS: ^:nil author:nil html-postamble:nil\n"
"#+SETUPFILE: ./simple_inline.theme\n" "#+SETUPFILE: ./simple_inline.theme\n"
"#+HTML_HEAD_EXTRA: <link rel=\"stylesheet\" type=\"text/css\" href=\"../css/plain.css\" />\n"
"#+TITLE: " title "\n\n" "#+TITLE: " title "\n\n"
(org-list-to-org list) "\nfile:sitemap.svg")) (org-list-to-org list) "\nfile:sitemap.svg"))
@ -114,11 +115,12 @@
:base-extension "org" :base-extension "org"
:exclude ".stversions/\\|.stfolder" :exclude ".stversions/\\|.stfolder"
:sitemap-function roam-sitemap :sitemap-function roam-sitemap
:sitemap-title "Roam notes" :sitemap-title "Roam Notes"
:style "<link rel=\"stylesheet\" href=\"../css/plain.css\" type=\"text/css\">"
:publishing-function roam-publication-wrapper :publishing-function roam-publication-wrapper
:publishing-directory "~/projects/blog-fschlde/pkb/" :publishing-directory "~/projects/fschlde-static/pkb/"
:section-number nil :section-number nil
:table-of-contents nil :table-of-contents t
:style "<link rel=\"stylesheet\" href=\"../other/mystyle.cs\" type=\"text/css\">") )
) )
) )

View File

@ -57,9 +57,11 @@
# #+TITLE: ? # #+TITLE: ?
# #+DATE: # #+DATE:
# #+SUBJECT: test letter subject #+SUBJECT: Betreff des Briefs
#+LCO: Absender-Frieder #+LCO: Absender-Frieder
# #+LCO: Absender-Marcelle
# #+LCO: Absender-FamilieSchlesier
#+LCO: Brief-de-modern #+LCO: Brief-de-modern
#+STARTUP: showall #+STARTUP: showall
@ -70,7 +72,9 @@
* Sehr geehrte Damen und Herren, * Sehr geehrte Damen und Herren,
? ?
* Mit freundlichen Grüßen, :closing: " * Mit freundlichen Grüßen, :closing:
Frieder Schlesier"
) )
("m" "Schedule a meeting" entry ("m" "Schedule a meeting" entry
(file+headline "~/Documents/Org/tasks.org") (file+headline "~/Documents/Org/tasks.org")