Merge branch 'gentoo-sway' of git.darkou.fr:dbroqua/home into gentoo-sway

pull/1/head
Damien Broqua 1 year ago
commit a470fa5b01
  1. 4
      bin/removeMerged.sh
  2. 5
      config/bpytop/bpytop.conf
  3. 4
      config/htop/htoprc
  4. 26
      config/sway/config
  5. 1
      config/waybar/style.css
  6. 1
      dotfiles/.aliases
  7. 17
      dotfiles/.oh-my-zsh/custom/themes/tywr.zsh-theme
  8. 16
      local/share/applications/mimeinfo.cache

@ -7,6 +7,10 @@ if [ $? = 1 ] ; then
git checkout dev
fi
if [ $? = 1 ] ; then
git checkout master
fi
# Get last changes
git pull

@ -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"

@ -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

@ -29,6 +29,7 @@ set $mod Mod4
# Displays
set $thinkstation HDMI-A-3
set $thinkstation-work DP-1
set $thinkpad eDP-1
# Workspaces
@ -40,8 +41,8 @@ set $wksp5 "5: Graphics"
set $wksp6 "6: Games"
set $wksp7 "7: Remote"
set $wksp8 "8: -"
set $wksp9 "9: -"
set $wksp10 "10: -"
set $wksp9 "9: Databases"
set $wksp10 "10: Debugger"
# Colors
set $nord0 #2E3440
@ -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
@ -112,8 +114,9 @@ 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
exec remmina -i
@ -193,6 +196,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
@ -288,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-work
workspace $wksp10 output $thinkstation-work
### Default workspace layout

@ -32,6 +32,7 @@ window#waybar {
border-radius: 4px;
background: rgba(76, 86, 106, 0.7);
margin: 0 4px;
border-bottom: 3px;
}
#workspaces {

@ -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

@ -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%}'

@ -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;

Loading…
Cancel
Save