From 51fe6b56b4ffcdf58f586613ad010b414047d4b7 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Tue, 13 Apr 2021 11:13:52 +0200 Subject: [PATCH 1/6] Added second screen --- config/sway/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/sway/config b/config/sway/config index bc717f6..df2b5ba 100644 --- a/config/sway/config +++ b/config/sway/config @@ -29,6 +29,7 @@ set $mod Mod4 # Displays set $thinkstation HDMI-A-3 +set $thinkstation-work DP-1 set $thinkpad eDP-1 # Workspaces @@ -77,6 +78,7 @@ set $modalHeight 800 # Screens definitions output $thinkstation resolution 3440x1440@100Hz position 0,0 adaptive_sync on +output $thinkstation-work resolution 1920x1080@60Hz position 3440,0 transform 270 adaptive_sync on output $thinkpad resolution 1920x1080 position 0,0 @@ -193,6 +195,9 @@ bindsym $mod+shift+p exec "$term -t 'Pulse Mixer' -e pulsemixer" bindsym $mod+shift+m exec "$term -t 'Music Player Client' -e ncmpcpp" bindsym $mod+shift+v exec "$term -t 'Audio Visualizer' -e cava" +# Screen +bindsym $mod+p exec swaymsg output $thinkstation-work toggle + # # Brightness bindsym XF86MonBrightnessDown exec light -U 10 From 8ca133f06a3cabcc0e5dbc23bd15e30bf677ba08 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Wed, 14 Apr 2021 15:17:32 +0200 Subject: [PATCH 2/6] Added KDEConnect at startup --- config/sway/config | 1 + 1 file changed, 1 insertion(+) diff --git a/config/sway/config b/config/sway/config index df2b5ba..68741d8 100644 --- a/config/sway/config +++ b/config/sway/config @@ -116,6 +116,7 @@ exec dbus-daemon --session --address=unix:path=$XDG_RUNTIME_DIR/bus exec gnome-keyring-daemon exec /usr/bin/libinput-gestures exec nm-applet --indicator +exec kdeconnect-indicator exec mako exec nextcloud --background exec remmina -i From 03a2ee8b961704f1b023f649a2fbb569bebafc7a Mon Sep 17 00:00:00 2001 From: dbroqua Date: Thu, 15 Apr 2021 21:58:59 +0200 Subject: [PATCH 3/6] Updated output definitions --- config/sway/config | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/config/sway/config b/config/sway/config index 68741d8..72b24f5 100644 --- a/config/sway/config +++ b/config/sway/config @@ -42,7 +42,7 @@ set $wksp6 "6: Games" set $wksp7 "7: Remote" set $wksp8 "8: -" set $wksp9 "9: -" -set $wksp10 "10: -" +set $wksp10 "10: Debugger" # Colors set $nord0 #2E3440 @@ -114,8 +114,8 @@ exec swayidle -w \ exec dbus-daemon --session --address=unix:path=$XDG_RUNTIME_DIR/bus exec gnome-keyring-daemon -exec /usr/bin/libinput-gestures -exec nm-applet --indicator +#exec /usr/bin/libinput-gestures +#exec nm-applet --indicator exec kdeconnect-indicator exec mako exec nextcloud --background @@ -294,7 +294,17 @@ mode "move" { ### Default placement # -#workspace $wksp1 output $display1 +workspace $wksp1 output $thinkstation +workspace $wksp2 output $thinkstation +workspace $wksp3 output $thinkstation +workspace $wksp4 output $thinkstation +workspace $wksp5 output $thinkstation +workspace $wksp6 output $thinkstation +workspace $wksp7 output $thinkstation +workspace $wksp8 output $thinkstation +workspace $wksp9 output $thinkstation +workspace $wksp10 output $thinkstation-work + ### Default workspace layout From 4b072507292130f8ad00123df3f486904aa2e069 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Tue, 25 May 2021 08:11:18 +0200 Subject: [PATCH 4/6] Added zsh prompt --- .../.oh-my-zsh/custom/themes/tywr.zsh-theme | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 dotfiles/.oh-my-zsh/custom/themes/tywr.zsh-theme diff --git a/dotfiles/.oh-my-zsh/custom/themes/tywr.zsh-theme b/dotfiles/.oh-my-zsh/custom/themes/tywr.zsh-theme new file mode 100644 index 0000000..f065620 --- /dev/null +++ b/dotfiles/.oh-my-zsh/custom/themes/tywr.zsh-theme @@ -0,0 +1,17 @@ +# Based on https://github.com/TyWR/Nord-zsh + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[white]%} on %{$fg_bold[yellow]%}\xee\x82\xa0 " +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[yellow]%}" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$reset_color%}%{$fg_bold[red]%}*%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +conda_env() { + if [ ! -z "$CONDA_PREFIX" ] + then + print -n " %{$fg_bold[white]%}on %{$fg_bold[blue]%}ꓛ ${CONDA_PREFIX##*/}%{$reset_color%}" + fi +} + +PROMPT=' + %{$fg_bold[green]%}%3c%{$reset_color%}$(git_prompt_info)$(conda_env) + %{$fg_bold[blue]%}${(%):-%m} ➜ %{$reset_color%}' From fc3aa2cc82bc5e3be966bb3047fe9ed6212a6c87 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Tue, 25 May 2021 08:13:41 +0200 Subject: [PATCH 5/6] Added master if fail fait dev* --- bin/removeMerged.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/removeMerged.sh b/bin/removeMerged.sh index 3572201..75dfbda 100755 --- a/bin/removeMerged.sh +++ b/bin/removeMerged.sh @@ -7,6 +7,10 @@ if [ $? = 1 ] ; then git checkout dev fi +if [ $? = 1 ] ; then + git checkout master +fi + # Get last changes git pull From 744737ed3d91a1ee7ad074064187cf75e141b4a0 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Tue, 25 May 2021 08:16:43 +0200 Subject: [PATCH 6/6] Minor changes --- config/bpytop/bpytop.conf | 5 ++++- config/htop/htoprc | 4 ++-- config/sway/config | 4 ++-- config/waybar/style.css | 1 + dotfiles/.aliases | 1 + local/share/applications/mimeinfo.cache | 16 ++++++++++++++++ 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/config/bpytop/bpytop.conf b/config/bpytop/bpytop.conf index 4e3b478..820a864 100644 --- a/config/bpytop/bpytop.conf +++ b/config/bpytop/bpytop.conf @@ -1,4 +1,4 @@ -#? Config file for bpytop v. 1.0.61 +#? Config file for bpytop v. 1.0.63 #* Color theme, looks for a .theme file in "/usr/[local/]share/bpytop/themes" and "~/.config/bpytop/themes", "Default" for builtin default theme. #* Prefix name by a plus sign (+) for a theme located in user themes folder, i.e. color_theme="+monokai" @@ -73,6 +73,9 @@ cpu_sensor=Auto #* Show temperatures for cpu cores also if check_temp is True and sensors has been found show_coretemp=True +#* Which temperature scale to use, available values: "celsius", "fahrenheit", "kelvin" and "rankine" +temp_scale="celsius" + #* Draw a clock at top of screen, formatting according to strftime, empty string to disable. draw_clock="%X" diff --git a/config/htop/htoprc b/config/htop/htoprc index dbf5c98..f501957 100644 --- a/config/htop/htoprc +++ b/config/htop/htoprc @@ -1,7 +1,7 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=47 +sort_key=46 sort_direction=1 hide_threads=0 hide_kernel_threads=1 @@ -12,7 +12,7 @@ show_program_path=1 highlight_base_name=0 highlight_megabytes=1 highlight_threads=1 -tree_view=1 +tree_view=0 header_margin=1 detailed_cpu_time=0 cpu_count_from_zero=0 diff --git a/config/sway/config b/config/sway/config index 72b24f5..71d4752 100644 --- a/config/sway/config +++ b/config/sway/config @@ -41,7 +41,7 @@ set $wksp5 "5: Graphics" set $wksp6 "6: Games" set $wksp7 "7: Remote" set $wksp8 "8: -" -set $wksp9 "9: -" +set $wksp9 "9: Databases" set $wksp10 "10: Debugger" # Colors @@ -302,7 +302,7 @@ workspace $wksp5 output $thinkstation workspace $wksp6 output $thinkstation workspace $wksp7 output $thinkstation workspace $wksp8 output $thinkstation -workspace $wksp9 output $thinkstation +workspace $wksp9 output $thinkstation-work workspace $wksp10 output $thinkstation-work diff --git a/config/waybar/style.css b/config/waybar/style.css index c46c641..a1881c4 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -32,6 +32,7 @@ window#waybar { border-radius: 4px; background: rgba(76, 86, 106, 0.7); margin: 0 4px; + border-bottom: 3px; } #workspaces { diff --git a/dotfiles/.aliases b/dotfiles/.aliases index 4985df9..1bdb3ac 100644 --- a/dotfiles/.aliases +++ b/dotfiles/.aliases @@ -6,6 +6,7 @@ alias ll="ls -l" alias lh="ls -lah" alias grep="grep --color=auto -n" alias diff='diff --color=auto' +alias gdiff='git diff' alias yarn="yarn --emoji true" # No space in file diff --git a/local/share/applications/mimeinfo.cache b/local/share/applications/mimeinfo.cache index 7dab7ea..c77b567 100644 --- a/local/share/applications/mimeinfo.cache +++ b/local/share/applications/mimeinfo.cache @@ -1 +1,17 @@ [MIME Cache] +application/prs.wavefront-obj=Ultimaker.desktop; +application/vnd.ms-3mfdocument=Ultimaker.desktop; +application/x-amf=Ultimaker.desktop; +application/x-ctm=Ultimaker.desktop; +application/x-ply=Ultimaker.desktop; +image/bmp=Ultimaker.desktop; +image/gif=Ultimaker.desktop; +image/jpeg=Ultimaker.desktop; +image/png=Ultimaker.desktop; +model/gltf+json=Ultimaker.desktop; +model/gltf-binary=Ultimaker.desktop; +model/stl=Ultimaker.desktop; +model/vnd.collada+xml=Ultimaker.desktop; +model/vnd.collada+xml+zip=Ultimaker.desktop; +text/markdown=Zettlr.desktop; +text/x-gcode=Ultimaker.desktop;