Merge branch 'master' of git.darkou.fr:dbroqua/home

This commit is contained in:
Damien Broqua 2022-03-15 18:07:17 +01:00
commit cb8207f9e3
6 changed files with 32 additions and 7 deletions

7
.gitignore vendored
View File

@ -47,3 +47,10 @@ local/share/Trash
config/remmina
config/filezilla
config/VSCodium
local/share/webkitgtk/
local/share/remmina
local/share/vlc
local/share/strawberry
local/share/DBeaverData
local/lib
local/bin

View File

@ -36,6 +36,7 @@ ARGS='-avz --delete
--exclude ./Software
--exclude /.local
--exclude /.DataGrip*
--exclude /.eclipse
--exclude /OneDrive'
ORIG='/home/dbroqua/'
DEST=''

View File

@ -31,12 +31,11 @@ font:
size: 9
normal:
family: FiraCode Nerd Font Mono
#family: Cascadia Code Light
style: Regular
bold:
family: FiraCode Nerd Font Mono
style: Bold
italic:
family: FiraCode Nerd Font Mono
style: Italic
colors:

View File

@ -3,7 +3,11 @@
htop_version=3.1.1
config_reader_min_version=2
fields=0 48 17 18 38 39 40 2 46 47 49 1
<<<<<<< HEAD
sort_key=47
=======
sort_key=46
>>>>>>> 7a081b244222e328ccf7594597629c5d6784666c
sort_direction=-1
tree_sort_key=0
tree_sort_direction=1
@ -23,20 +27,33 @@ strip_exe_from_cmdline=1
show_merged_command=0
tree_view=0
tree_view_always_by_pid=0
<<<<<<< HEAD
all_branches_collapsed=0
=======
>>>>>>> 7a081b244222e328ccf7594597629c5d6784666c
header_margin=1
detailed_cpu_time=0
cpu_count_from_one=1
show_cpu_usage=1
show_cpu_frequency=0
show_cpu_temperature=0
degree_fahrenheit=0
update_process_names=0
account_guest_in_cpu_meter=0
color_scheme=0
enable_mouse=1
delay=15
<<<<<<< HEAD
hide_function_bar=0
header_layout=two_50_50
column_meters_0=Hostname Tasks Blank Blank LeftCPUs4 Memory
column_meter_modes_0=2 2 2 2 1 1
column_meters_1=Clock Uptime LoadAverage Blank RightCPUs4 Swap
column_meter_modes_1=2 2 2 2 1 1
=======
left_meters=Hostname Tasks Blank Blank LeftCPUs4 Memory
left_meter_modes=2 2 2 2 1 1
right_meters=Clock Uptime LoadAverage Blank RightCPUs4 Swap
right_meter_modes=2 2 2 2 1 1
hide_function_bar=0
>>>>>>> 7a081b244222e328ccf7594597629c5d6784666c

View File

@ -9,6 +9,7 @@ alias grep="grep --color=auto -n"
alias diff='diff --color=auto'
alias gdiff='git diff'
alias yarn="yarn --emoji true"
alias tv="tidy-viewer -c 1 "
alias pls="pls -i nerd --details"
# No space in file
@ -35,6 +36,6 @@ alias music='sshfs dmc-12:/srv/dev-disk-by-label-storage/medias/Music ~/Music'
alias dh="dfc -t xfs,ext2 2>/dev/null"
alias irc="ssh jules -t tmux attach-session -t irc"
alias irc="ssh marvin -t tmux attach-session -t irc"
alias getClass="swaymsg -t get_tree| grep $1"

View File

@ -173,7 +173,7 @@ fi
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
if [ -z $DISPLAY ] && [ "$(tty)" == "/dev/tty1" ]; then
export MOZ_ENABLE_WAYLAND=1
exec sway
fi
#if [ -z "$DISPLAY" ] && [ "$(tty)" == "/dev/tty1" ]; then
# export MOZ_ENABLE_WAYLAND=1
# exec sway
#fi