tadgy/dotfiles
1
0
Fork 0
Code Releases Wiki Activity Actions

.screenrc: merge conflicts

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2018-07-07 05:50:12 +01:00
commit f1d9d95469
6 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.config/htop/htoprc
View file

@ -4,7 +4,7 @@ fields=0 48 17 18 38 39 40 2 46 47 49 1
sort_key=46 sort_key=46
sort_direction=1 sort_direction=1
hide_threads=0 hide_threads=0
hide_kernel_threads=0 hide_kernel_threads=1
hide_userland_threads=0 hide_userland_threads=0
shadow_other_users=1 shadow_other_users=1
show_thread_names=0 show_thread_names=0
@ -13,14 +13,14 @@ highlight_base_name=1
highlight_megabytes=1 highlight_megabytes=1
highlight_threads=1 highlight_threads=1
tree_view=0 tree_view=0
header_margin=1 header_margin=0
detailed_cpu_time=0 detailed_cpu_time=0
cpu_count_from_zero=1 cpu_count_from_zero=1
update_process_names=0 update_process_names=0
account_guest_in_cpu_meter=0 account_guest_in_cpu_meter=0
color_scheme=0 color_scheme=0
delay=15 delay=15
left_meters=AllCPUs2 AllCPUs LoadAverage left_meters=AllCPUs CPU
left_meter_modes=3 1 2 left_meter_modes=1 1
right_meters=Memory Memory Swap Tasks right_meters=Uptime LoadAverage Tasks Memory Swap
right_meter_modes=3 1 1 2 right_meter_modes=2 2 2 1 1

2
.gitignore vendored
View file

@ -3,6 +3,4 @@
.*.swp .*.swp
.bash_history .bash_history
.lesshst .lesshst
.ssh/id_rsa
.ssh/id_ed25519
NOTES NOTES

8
.screenrc
View file

@ -37,7 +37,7 @@ bind ^\
bind \\ quit bind \\ quit
# Start window numbering from 1, not 0. # Start window numbering from 1, not 0.
#screen 1 screen 1
#bind c screen 1 bind c screen 1
#bind ^c screen 1 bind ^c screen 1
#bind 0 select 10 bind 0 select 10

4
.ssh/.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
agent
id_rsa
id_ed25519
known_hosts

2
.ssh/authorized_keys
View file

@ -1,2 +1,2 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCtsRUCRcju+l1TrfwGQ/PCcXBwN8bTCcmS0PYbdu13XJQ9DijTZsU7m2k8pi2fFU0VG5+C57i4FhkV3J7Ngpu0XDM4CPuoq2agRTEMXZlHu0aO8mEaPBli5oEkx/m1yinL0FapDfxMkeLDp3eHL0Gw2I0G6Kg8j4jl0pz4uYPLrrMbcWgEin+ijUE71lRXXJ2U6whCFBz991XDTkyX9a3CMAKIjYq0qTMyBGWUzHVNVPCXXa1bcK6Jj6jlkW1oowfccof3mDtm5Tef54pFAWS6yYSM+XkmCStknDInKI/fL54LnH6PZxEz2wdRXArMNk80gNyzLbOqEddnaoTaSowTIcXOUyzMrgyf/c2WZp9Ss05kgt6e+sTFqEREt1oslGP8s2rtvhRCyAaQM0X5TutqycLeNbm7duKmb4FuYvRqbi6ECqrUZ5roz5ushrtEvUY74xmo3Wt5/6piDV7VTCLUqNJNcB+rPFLG+LYUS+G1w4HZGXXgIERcHHDdvt4LQm0= Darren 'Tadgy' Austin <darren@afterdark.org.uk>
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICsx4EY4vbDt0TXGZsW9UjOxj+s/mVeytJ7lW5rAu0gS Darren 'Tadgy' Austin <darren@afterdark.org.uk> ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICsx4EY4vbDt0TXGZsW9UjOxj+s/mVeytJ7lW5rAu0gS Darren 'Tadgy' Austin <darren@afterdark.org.uk>
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCtsRUCRcju+l1TrfwGQ/PCcXBwN8bTCcmS0PYbdu13XJQ9DijTZsU7m2k8pi2fFU0VG5+C57i4FhkV3J7Ngpu0XDM4CPuoq2agRTEMXZlHu0aO8mEaPBli5oEkx/m1yinL0FapDfxMkeLDp3eHL0Gw2I0G6Kg8j4jl0pz4uYPLrrMbcWgEin+ijUE71lRXXJ2U6whCFBz991XDTkyX9a3CMAKIjYq0qTMyBGWUzHVNVPCXXa1bcK6Jj6jlkW1oowfccof3mDtm5Tef54pFAWS6yYSM+XkmCStknDInKI/fL54LnH6PZxEz2wdRXArMNk80gNyzLbOqEddnaoTaSowTIcXOUyzMrgyf/c2WZp9Ss05kgt6e+sTFqEREt1oslGP8s2rtvhRCyAaQM0X5TutqycLeNbm7duKmb4FuYvRqbi6ECqrUZ5roz5ushrtEvUY74xmo3Wt5/6piDV7VTCLUqNJNcB+rPFLG+LYUS+G1w4HZGXXgIERcHHDdvt4LQm0= Darren 'Tadgy' Austin <darren@afterdark.org.uk>

10
.ssh/config
View file

@ -17,9 +17,19 @@ Host leela leela.open-source.co.uk
HostName leela.open-source.co.uk HostName leela.open-source.co.uk
Port 9922 Port 9922
Host slackware.uk
ForwardAgent yes
Hostname slackware.uk
Port 9922
Host full-* build-* clone-* Host full-* build-* clone-*
User root User root
Host slackware.uk
ForwardAgent yes
Hostname slackware.uk
Port 9922
Host * Host *
# AddKeysToAgent yes # AddKeysToAgent yes
ConnectTimeout 30 ConnectTimeout 30