merge
This commit is contained in:
@@ -149,4 +149,11 @@ if [ $TILIX_ID ] || [ $VTE_VERSION ]; then
|
|||||||
source /etc/profile.d/vte.sh
|
source /etc/profile.d/vte.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export QSYS_ROOTDIR="/home/kristjank/.cache/yay/quartus-free/pkg/quartus-free-quartus/opt/intelFPGA/21.1/quartus/sopc_builder/bin"
|
export QSYS_ROOTDIR="/home/kristjank/.cache/yay/quartus-free/pkg/quartus-free-quartus/opt/intelFPGA/23.1/quartus/sopc_builder/bin"
|
||||||
|
|
||||||
|
# Created by `pipx` on 2024-07-22 20:55:01
|
||||||
|
export PATH="$PATH:/home/kristjank/.local/bin"
|
||||||
|
eval "$(register-python-argcomplete pipx)"
|
||||||
|
|
||||||
|
# Added by LM Studio CLI (lms)
|
||||||
|
export PATH="$PATH:/home/kristjank/.cache/lm-studio/bin"
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
]]
|
]]
|
||||||
|
|
||||||
conky.config = {
|
conky.config = {
|
||||||
lua_load = "~/.config/conky/vaconvert.lua",
|
lua_load = "/home/kristjank/.config/conky/vaconvert.lua",
|
||||||
alignment = 'bottom_right',
|
alignment = 'bottom_right',
|
||||||
background = false,
|
background = false,
|
||||||
border_width = 1,
|
border_width = 1,
|
||||||
@@ -52,10 +52,10 @@ conky.config = {
|
|||||||
out_to_x = true,
|
out_to_x = true,
|
||||||
own_window = true,
|
own_window = true,
|
||||||
own_window_class = 'Conky',
|
own_window_class = 'Conky',
|
||||||
own_window_type = 'dock',
|
own_window_type = 'normal',
|
||||||
own_window_transparent = false,
|
own_window_transparent = false,
|
||||||
own_window_argb_visual = true,
|
own_window_argb_visual = true,
|
||||||
own_window_argb_value = 85,
|
own_window_argb_value = 175,
|
||||||
own_window_hints = 'undecorated,sticky,skip_taskbar,skip_pager,below',
|
own_window_hints = 'undecorated,sticky,skip_taskbar,skip_pager,below',
|
||||||
show_graph_range = false,
|
show_graph_range = false,
|
||||||
show_graph_scale = false,
|
show_graph_scale = false,
|
||||||
@@ -75,7 +75,6 @@ $hr
|
|||||||
${color green}Delovanje sistema
|
${color green}Delovanje sistema
|
||||||
${color grey}CPU:$color $freq MHz $cpu% ${cpubar 4}
|
${color grey}CPU:$color $freq MHz $cpu% ${cpubar 4}
|
||||||
${color grey}RAM:$color $mem/$memmax - $memperc% ${membar 4}
|
${color grey}RAM:$color $mem/$memmax - $memperc% ${membar 4}
|
||||||
${color grey}SWP:$color $swap/$swapmax - $swapperc% ${swapbar 4}
|
|
||||||
${color grey}NET:$color ${downspeed enp3s0f0}/${upspeed enp3s0f0}
|
${color grey}NET:$color ${downspeed enp3s0f0}/${upspeed enp3s0f0}
|
||||||
CPU ${cpugraph 45}
|
CPU ${cpugraph 45}
|
||||||
RAM ${memgraph 45}
|
RAM ${memgraph 45}
|
||||||
@@ -89,7 +88,9 @@ ${apcupsd_loadgraph 45}
|
|||||||
$hr
|
$hr
|
||||||
${color green}Zasedenost pogonov:$color
|
${color green}Zasedenost pogonov:$color
|
||||||
/ $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
|
/ $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
|
||||||
backup $color${fs_used /mnt/backup}/${fs_size /mnt/backup} ${fs_bar 6 /mnt/backup}
|
bk $color${fs_used /mnt/backup}/${fs_size /mnt/backup} ${fs_bar 6 /mnt/backup}
|
||||||
|
dl $color${fs_used /mnt/downloads}/${fs_size /mnt/downloads} ${fs_bar 6 /mnt/downloads}
|
||||||
|
|
||||||
$hr
|
$hr
|
||||||
${color grey}Vsi procesi:$color $processes
|
${color grey}Vsi procesi:$color $processes
|
||||||
${color grey}Ime PID CPU% MEM%
|
${color grey}Ime PID CPU% MEM%
|
||||||
|
|||||||
@@ -6,4 +6,7 @@ export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
|
|||||||
export PS1="[\[$(tput sgr0)\]\[\033[38;5;10m\]\u@\h\[$(tput sgr0)\]:\[$(tput sgr0)\]\[\033[38;5;14m\]\w\[$(tput sgr0)\]]\\$ \[$(tput sgr0)\]"
|
export PS1="[\[$(tput sgr0)\]\[\033[38;5;10m\]\u@\h\[$(tput sgr0)\]:\[$(tput sgr0)\]\[\033[38;5;14m\]\w\[$(tput sgr0)\]]\\$ \[$(tput sgr0)\]"
|
||||||
export PATH="$PATH:/home/kristjank/.cargo/bin"
|
export PATH="$PATH:/home/kristjank/.cargo/bin"
|
||||||
|
|
||||||
export QSYS_ROOTDIR="/home/kristjank/.cache/yay/quartus-free/pkg/quartus-free-quartus/opt/intelFPGA/21.1/quartus/sopc_builder/bin"
|
export QSYS_ROOTDIR="/home/kristjank/.cache/yay/quartus-free/pkg/quartus-free-quartus/opt/intelFPGA/23.1/quartus/sopc_builder/bin"
|
||||||
|
|
||||||
|
# Added by LM Studio CLI (lms)
|
||||||
|
export PATH="$PATH:/home/kristjank/.cache/lm-studio/bin"
|
||||||
|
|||||||
@@ -2,11 +2,27 @@ KexAlgorithms +diffie-hellman-group1-sha1,curve25519-sha256@libssh.org,ecdh-sha2
|
|||||||
HostKeyAlgorithms +ssh-rsa
|
HostKeyAlgorithms +ssh-rsa
|
||||||
Ciphers +3des-cbc
|
Ciphers +3des-cbc
|
||||||
|
|
||||||
CanonicalDomains senca.nextarray.com nextarray.com
|
|
||||||
CanonicalizeHostname yes
|
CanonicalizeHostname yes
|
||||||
|
|
||||||
Host *.nextarray.com
|
# Jumphost preko sag-core-sw1
|
||||||
User netnet
|
Host sag* !sag-core-sw1
|
||||||
|
ProxyJump root@180.149.32.2
|
||||||
|
User root
|
||||||
|
|
||||||
|
|
||||||
|
Host sag-rtr1
|
||||||
|
User root
|
||||||
|
Hostname 180.149.32.1
|
||||||
|
Host sag-core-sw1
|
||||||
|
Hostname 180.149.32.2
|
||||||
|
Host sag-core-sw2
|
||||||
|
Hostname 180.149.32.2
|
||||||
|
Host sag-s1p1r1a1-sw1
|
||||||
|
Hostname 10.30.21.11
|
||||||
|
Host sag-s1p1r1a1-sw2
|
||||||
|
Hostname 10.30.21.12
|
||||||
|
Host sag-s1p1r1a2-sw1
|
||||||
|
Hostname 10.30.21.13
|
||||||
|
Host sag-s1p1r1a2-sw2
|
||||||
|
Hostname 10.30.21.14
|
||||||
|
|
||||||
Host *.senca.nextarray.com
|
|
||||||
ProxyJump netnet@hermes.nextarray.com:22
|
|
||||||
|
|||||||
31
dot_ssh/config.orig
Normal file
31
dot_ssh/config.orig
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
KexAlgorithms +diffie-hellman-group1-sha1,curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group14-sha1
|
||||||
|
<<<<<<< HEAD
|
||||||
|
HostKeyAlgorithms +ssh-rsa
|
||||||
|
=======
|
||||||
|
>>>>>>> origin/master
|
||||||
|
Ciphers +3des-cbc
|
||||||
|
|
||||||
|
CanonicalizeHostname yes
|
||||||
|
|
||||||
|
# Jumphost preko sag-core-sw1
|
||||||
|
Host sag* !sag-core-sw1
|
||||||
|
ProxyJump root@180.149.32.2
|
||||||
|
User root
|
||||||
|
|
||||||
|
|
||||||
|
Host sag-rtr1
|
||||||
|
User root
|
||||||
|
Hostname 180.149.32.1
|
||||||
|
Host sag-core-sw1
|
||||||
|
Hostname 180.149.32.2
|
||||||
|
Host sag-core-sw2
|
||||||
|
Hostname 180.149.32.2
|
||||||
|
Host sag-s1p1r1a1-sw1
|
||||||
|
Hostname 10.30.21.11
|
||||||
|
Host sag-s1p1r1a1-sw2
|
||||||
|
Hostname 10.30.21.12
|
||||||
|
Host sag-s1p1r1a2-sw1
|
||||||
|
Hostname 10.30.21.13
|
||||||
|
Host sag-s1p1r1a2-sw2
|
||||||
|
Hostname 10.30.21.14
|
||||||
|
|
||||||
Reference in New Issue
Block a user