From acd6b00420a8acafb6865edc2058d6b2c8e0c71b Mon Sep 17 00:00:00 2001 From: Paul Aumann Date: Wed, 21 Aug 2024 01:24:22 +0200 Subject: [PATCH] changed some --- .../Code/User/snippets/py-main.code-snippets | 2 +- .config/alacritty/alacritty.toml | 58 +++--- .config/alacritty/icon.svg | 44 ++++ .config/gSnap/layouts.json | 38 ++++ .config/gdb/gdbinit | 1 + .config/i3/config | 193 ++++++++++++++++++ .tmux.conf | 8 +- .zshrc | 18 +- 8 files changed, 323 insertions(+), 39 deletions(-) create mode 100644 .config/alacritty/icon.svg create mode 100644 .config/i3/config diff --git a/.config/Code/User/snippets/py-main.code-snippets b/.config/Code/User/snippets/py-main.code-snippets index 4222c05..a95e8a6 100644 --- a/.config/Code/User/snippets/py-main.code-snippets +++ b/.config/Code/User/snippets/py-main.code-snippets @@ -44,6 +44,6 @@ "python shebang" : { "scope": "python", "prefix": "sb", - "body": "#!/usr/bin/python3" + "body": "#!/usr/bin/env python3" } } \ No newline at end of file diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index a6633f0..fb2d6bb 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -9,36 +9,36 @@ duration = 0 draw_bold_text_with_bright_colors = false [colors.bright] -black = "#7B7B7B" -blue = "#B5DCFE" -cyan = "#DFDFFD" -green = "#CEFFAB" -magenta = "#FB9BFE" -red = "#AF4B57" -white = "#FEFFFE" -yellow = "#FFFECC" +black = "#505050" +blue = "#547C99" +cyan = "#7DD6CF" +green = "#7B9246" +magenta = "#9F4E85" +red = "#A53C23" +white = "#F5F5F5" +yellow = "#D3A04D" [colors.cursor] cursor = "0x4d4d4c" text = "0xffffff" [colors.normal] -black = "#4F4F4F" -blue = "#7D90A4" -cyan = "#85A6A5" -green = "#AFD383" -magenta = "#A4799D" -red = "#AF4B57" -white = "#EEEDEE" -yellow = "#E5C079" +black = "#151515" +blue = "#6C99BB" +cyan = "#7DD6CF" +green = "#7B9246" +magenta = "#9F4E85" +red = "#A53C23" +white = "#D0D0D0" +yellow = "#D3A04D" [colors.primary] -background = "#1C1F27" -foreground = "#979CAC" +background = "#222222" +foreground = "#D0D0D0" -[cursor] -style = "Block" -unfocused_hollow = true +[cursor.style] +shape = "Beam" +blinking = "On" [debug] log_level = "OFF" @@ -50,19 +50,19 @@ render_timer = false size = 16.0 [font.bold] -family = "Source Code Pro" -style = "Bold" +family = "Monaspace Neon" +style = "Regular" [font.glyph_offset] x = 0 y = 0 [font.italic] -family = "Source Code Pro" +family = "Monaspace Neon" style = "Italic" [font.normal] -family = "Source Code Pro" +family = "Monaspace Neon" style = "Regular" [font.offset] @@ -74,6 +74,11 @@ bindings = [ { action = "PasteSelection", mouse = "Middle" }, ] +[keyboard] +bindings = [ + { key = "Back", mods = "Control", chars = "\u001b\u007f"} +] + [scrolling] history = 100000 multiplier = 3 @@ -84,9 +89,12 @@ semantic_escape_chars = ",│`|:\"' ()[]{}<>" [window] decorations = "full" +blur = false dynamic_padding = false opacity = 1 startup_mode = "windowed" +title = "Terminal" +dynamic_title = false [window.dimensions] columns = 85 diff --git a/.config/alacritty/icon.svg b/.config/alacritty/icon.svg new file mode 100644 index 0000000..905b181 --- /dev/null +++ b/.config/alacritty/icon.svg @@ -0,0 +1,44 @@ + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.config/gSnap/layouts.json b/.config/gSnap/layouts.json index d1b0ee4..8c0c05b 100644 --- a/.config/gSnap/layouts.json +++ b/.config/gSnap/layouts.json @@ -150,6 +150,44 @@ "items": [] } ] + }, + { + "name" : "1920x1080 Centered", + "type" : 0, + "length" : 100, + "items" : [ + { + "type" : 0, + "length" : 21.9, + "items" : [] + }, + { + "type" : 1, + "length" : 56.2, + "items" : [ + { + "type" : 1, + "length" : 9.8, + "items" : [] + }, + { + "type" : 1, + "length" : 80.4, + "items" : [] + }, + { + "type" : 1, + "length" : 9.8, + "items" : [] + } + ] + }, + { + "type" : 0, + "length" : 21.9, + "items" : [] + } + ] } ] } \ No newline at end of file diff --git a/.config/gdb/gdbinit b/.config/gdb/gdbinit index afff122..49018ce 100644 --- a/.config/gdb/gdbinit +++ b/.config/gdb/gdbinit @@ -1 +1,2 @@ add-auto-load-safe-path /home/paul/code/ma/repo/scripts/gdb/vmlinux-gdb.py + add-auto-load-safe-path /home/paul/code/ma/morsel-linux-kernel/scripts/gdb/vmlinux-gdb.py diff --git a/.config/i3/config b/.config/i3/config new file mode 100644 index 0000000..f574074 --- /dev/null +++ b/.config/i3/config @@ -0,0 +1,193 @@ +# This file has been auto-generated by i3-config-wizard(1). +# It will not be overwritten, so edit it as you like. +# +# Should you change your keyboard layout some time, delete +# this file and re-run i3-config-wizard(1). +# + +# i3 config file (v4) +# +# Please see https://i3wm.org/docs/userguide.html for a complete reference! + +set $mod Mod1 + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +# font pango:monospace 8 + +# This font is widely installed, provides lots of unicode glyphs, right-to-left +# text rendering and scalability on retina/hidpi displays (thanks to pango). +font pango:DejaVu Sans Mono 8 + +# Start XDG autostart .desktop files using dex. See also +# https://wiki.archlinux.org/index.php/XDG_Autostart +exec --no-startup-id dex --autostart --environment i3 + +# The combination of xss-lock, nm-applet and pactl is a popular choice, so +# they are included here as an example. Modify as you see fit. + +# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the +# screen before suspend. Use loginctl lock-session to lock your screen. +exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork + +# NetworkManager is the most popular way to manage wireless networks on Linux, +# and nm-applet is a desktop environment-independent system tray GUI for it. +exec --no-startup-id nm-applet + +# Use pactl to adjust volume in PulseAudio. +set $refresh_i3status killall -SIGUSR1 i3status +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +# move tiling windows via drag & drop by left-clicking into the title bar, +# or left-clicking anywhere into the window while holding the floating modifier. +tiling_drag modifier titlebar + +# start a terminal +bindsym $mod+Return exec i3-sensible-terminal + +# kill focused window +bindsym $mod+Shift+q kill + +# start dmenu (a program launcher) +bindsym $mod+d exec --no-startup-id dmenu_run +# A more modern dmenu replacement is rofi: +# bindcode $mod+40 exec "rofi -modi drun,run -show drun" +# There also is i3-dmenu-desktop which only displays applications shipping a +# .desktop file. It is a wrapper around dmenu, so you need that installed. +# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop + +# change focus +bindsym $mod+j focus left +bindsym $mod+k focus down +bindsym $mod+l focus up +bindsym $mod+odiaeresis focus right + +# alternatively, you can use the cursor keys: +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +# move focused window +bindsym $mod+Shift+j move left +bindsym $mod+Shift+k move down +bindsym $mod+Shift+l move up +bindsym $mod+Shift+odiaeresis move right + +# alternatively, you can use the cursor keys: +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +# split in horizontal orientation +bindsym $mod+h split h + +# split in vertical orientation +bindsym $mod+v split v + +# enter fullscreen mode for the focused container +bindsym $mod+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+a focus parent + +# focus the child container +#bindsym $mod+d focus child + +# Define names for default workspaces for which we configure key bindings later on. +# We use variables to avoid repeating the names in multiple places. +set $ws1 "1" +set $ws2 "2" +set $ws3 "3" +set $ws4 "4" +set $ws5 "5" +set $ws6 "6" +set $ws7 "7" +set $ws8 "8" +set $ws9 "9" +set $ws10 "10" + +# switch to workspace +bindsym $mod+1 workspace number $ws1 +bindsym $mod+2 workspace number $ws2 +bindsym $mod+3 workspace number $ws3 +bindsym $mod+4 workspace number $ws4 +bindsym $mod+5 workspace number $ws5 +bindsym $mod+6 workspace number $ws6 +bindsym $mod+7 workspace number $ws7 +bindsym $mod+8 workspace number $ws8 +bindsym $mod+9 workspace number $ws9 +bindsym $mod+0 workspace number $ws10 + +# move focused container to workspace +bindsym $mod+Shift+1 move container to workspace number $ws1 +bindsym $mod+Shift+2 move container to workspace number $ws2 +bindsym $mod+Shift+3 move container to workspace number $ws3 +bindsym $mod+Shift+4 move container to workspace number $ws4 +bindsym $mod+Shift+5 move container to workspace number $ws5 +bindsym $mod+Shift+6 move container to workspace number $ws6 +bindsym $mod+Shift+7 move container to workspace number $ws7 +bindsym $mod+Shift+8 move container to workspace number $ws8 +bindsym $mod+Shift+9 move container to workspace number $ws9 +bindsym $mod+Shift+0 move container to workspace number $ws10 + +# reload the configuration file +bindsym $mod+Shift+c reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $mod+Shift+r restart +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym j resize shrink width 10 px or 10 ppt + bindsym k resize grow height 10 px or 10 ppt + bindsym l resize shrink height 10 px or 10 ppt + bindsym odiaeresis resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" +} + +bindsym $mod+r mode "resize" + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + status_command i3status +} + + +gaps inner 10 \ No newline at end of file diff --git a/.tmux.conf b/.tmux.conf index 9e3255d..f4191c6 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -19,9 +19,15 @@ unbind % # reload on r bind r source-file ~/.tmux.conf \; display "Reloaded config!" +# number of scrollback lines +set-option -g history-limit 5000 + # enable mouse mode set -g mouse on +# stop window to stop jump to bottom when selection something +unbind-key -T copy-mode-vi MouseDragEnd1Pane + # start numbering panes at 1 set -g base-index 1 setw -g pane-base-index 1 @@ -39,4 +45,4 @@ set -g status-right-length 50 set -g status-left-length 10 setw -g window-status-current-style "fg=black bg=color6" setw -g window-status-current-format " #I #W #F " -setw -g window-status-format " #I #[fg=colour7]#W #[fg=colour1]#F " \ No newline at end of file +setw -g window-status-format " #I #[fg=colour7]#W #[fg=colour1]#F " diff --git a/.zshrc b/.zshrc index eadf478..aefa772 100644 --- a/.zshrc +++ b/.zshrc @@ -70,7 +70,7 @@ DISABLE_UNTRACKED_FILES_DIRTY="true" # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git zsh-autosuggestions macos pip pyenv docker colorize copyfile brew) +plugins=(git zsh-autosuggestions zsh-syntax-highlighting fast-syntax-highlighting macos pip pyenv docker colorize copyfile brew) source $ZSH/oh-my-zsh.sh @@ -130,11 +130,14 @@ alias zshconfig="$EDITOR ~/.zshrc" alias zshreload="source ~/.zshrc" alias zshsource="source ~/.zshrc" alias home="cd ~" -alias userchrome="$EDITOR /Users/paul/Library/Application\ Support/Firefox/Profiles/k37hu3wo.default-release/chrome/userChrome.css" +alias userchrome="$EDITOR ~/.mozilla/firefox/jcjwalyb.default-release/chrome/userChrome.css" alias kw='echo Current Week: $((10#$(date +"%V")))' alias wol=wakeonlan alias ge=gnome-extensions alias open="xdg-open" +alias lg="lazygit" + +alias R="R --no-save" # Python tkinter stuff export PATH="/usr/local/opt/tcl-tk/bin:$PATH" @@ -142,17 +145,7 @@ export PATH="/usr/local/opt/tcl-tk/bin:$PATH" # autojump [ -f /opt/homebrew/etc/profile.d/autojump.sh ] && . /opt/homebrew/etc/profile.d/autojump.sh -# spicetify -alias sba="spicetify backup apply" - -# bitwarden-cli -alias bw='NODE_OPTIONS="--no-deprecation" bw' - -# connect to smb shares -alias mount-ds='[ -e "/Volumes/pauls-dateien" ] || open "smb://paul@192.168.193.68/pauls-dateien"' - # vscode shortcuts -alias ma="code --folder-uri=vscode-remote://ssh-remote+sralab/home/2021/pau.aumann/ma" alias ws="cd ~/code/wasteside && code . && tmux new -A -s wasteside" # Fix ls colors for synology directories @@ -169,6 +162,7 @@ SAVEHIST=10000 # reload "blur my shell" alias blur-my-shell="gnome-extensions disable blur-my-shell@aunetx && gnome-extensions enable blur-my-shell@aunetx" alias bms=blur-my-shell +bms # run it, so it reloads on terminal open # zoxide eval "$(zoxide init --cmd cd zsh)"