dotfiles.git

commit ca80906cae71ab80c70fa6dec88f71be6b7e9bdd

Author: Adam <git@apiote.xyz>

konflikt


 .config/fish/config.fish | 2 
 .config/fish/fish_variables | 2 
 .config/gtk-3.0/settings.ini | 20 ++++---
 .config/kak/autoload/autoload | 2 
 .config/kak/kakrc | 2 
 .config/mpv/mpv.conf | 4 
 .config/sh/variables | 2 
 .config/wezterm/wezterm.lua | 2 
 .gitconfig | 6 +-
 .gtkrc-2.0 | 12 ++++
 .local/bin/kak | 10 ----
 .local/bin/photosArchive | 6 +-
 .local/share/qalculate/definitions/datasets.xml | 2 
 .local/share/qalculate/definitions/functions.xml | 2 
 .local/share/qalculate/definitions/units.xml | 2 
 .local/share/qalculate/definitions/variables.xml | 15 -----
 .profile | 12 ++++
 .ssh/config | 44 ++++++++++++++++++


diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 47fa23d3b7edd778ef20a4ed0075d06415fb80b9..c846d9c57234ded9ca028eb1de57d736033e3332 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -46,6 +46,8 @@
 
 if [ -f /tmp/ssh-agent.fish ]
 	. /tmp/ssh-agent.fish >/dev/null
+else
+	ssh-agent -c >/tmp/ssh-agent.fish
 end
 
 if [ -f /tmp/dbus.fish ]




diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index ed63e7accaacc549d7de0cbb105bebc899185e9e..fcc43df29743c717639ccba585f789aa8decbe21 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -2,7 +2,7 @@ # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR __done_min_cmd_duration:5000
 SETUVAR __done_sway_ignore_visible:1
-SETUVAR __fish_initialized:3400
+SETUVAR __fish_initialized:3100
 SETUVAR _fisher_franciscolourenco_2F_done_files:/home/adam/\x2econfig/fish/conf\x2ed/done\x2efish
 SETUVAR _fisher_jorgebucaran_2F_fisher_files:/home/adam/\x2econfig/fish/functions/fisher\x2efish\x1e/home/adam/\x2econfig/fish/completions/fisher\x2efish
 SETUVAR _fisher_plugins:franciscolourenco/done\x1ejorgebucaran/fisher




diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index 35c33cfe61cb9cb727c2640d8b40b5bd19977b1f..60852f3f87f666fc1965787b79923c59736fa979 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -1,16 +1,20 @@
 [Settings]
 gtk-application-prefer-dark-theme=true
-gtk-theme-name=Materia
-gtk-icon-theme-name=Papirus-Dark
-gtk-font-name=Fira Sans 11
+gtk-button-images=true
 gtk-cursor-theme-name=Breeze_Amber
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_BOTH
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
+gtk-cursor-theme-size=24
+gtk-decoration-layout=close,maximize,minimize:icon
+gtk-enable-animations=true
 gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=1
+gtk-font-name=Noto Sans,  10
+gtk-icon-theme-name=Paper
+gtk-menu-images=true
+gtk-modules=colorreload-gtk-module
+gtk-primary-button-warps-slider=false
+gtk-theme-name=Materia-dark
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-toolbar-style=3
 gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintfull




diff --git a/.config/kak/autoload/autoload b/.config/kak/autoload/autoload
index b45d6560e613b96c58c9d58b688eb856bcf848da..20a3f888478caf4b25aa84bee31fb67567f93538 120000
--- a/.config/kak/autoload/autoload
+++ b/.config/kak/autoload/autoload
@@ -1 +1 @@
-/usr/share/kak/autoload
\ No newline at end of file
+/usr/local/share/kak/autoload/
\ No newline at end of file




diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index 0e42510507608c5df48a9d2aac2d4fe151b77287..a1bba7debb28cfd7eaa3eadd7b0d23ff75a09992 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -20,7 +20,7 @@ 	unalias global e edit
 	alias global e edit-or-dir
 }
 plug "andreyorst/smarttab.kak" %{
-	hook global WinSetOption filetype=python expandtab
+	hook global WinSetOption filetype=(python|yaml) expandtab
 	hook global BufCreate .* %{
 		set-option buffer tabstop 2
 		set-option buffer indentwidth 2




diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf
index 170940d32a002ff5223538a7344abc312f2537d7..1cda30321b3d3c5eaeb3af180fdc78ddc53f3e83 100644
--- a/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
@@ -1,6 +1,6 @@
 stop-screensaver=yes
-gpu-context=wayland
-vo=gpu
+#gpu-context=wayland
+#vo=gpu
 #ao=alsa
 volume-max=300
 




diff --git a/.config/sh/variables b/.config/sh/variables
index 6c21343b5b8bdf7a44b2f44b1f5ebbb281398aa4..323dec06918fa74e0c3bebee4f883eb8ad9ffa3f 100644
--- a/.config/sh/variables
+++ b/.config/sh/variables
@@ -1,6 +1,6 @@
 export _JAVA_AWT_WM_NONREPARENTING=1
 export GTK_THEME=Materia:dark
-export EDITOR=kak
+export EDITOR=hx
 export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1
 export GOPATH=~/.go
 export XZ_OPT=--threads=0




diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua
index 27455364785cc052d27c78978669814012eacb68..308209892a6601dea2e0d63194271f18cd7e01fc 100644
--- a/.config/wezterm/wezterm.lua
+++ b/.config/wezterm/wezterm.lua
@@ -1,11 +1,13 @@
 local wezterm = require 'wezterm';
 
 return {
+	default_prog = { '/usr/bin/fish', '-l' },
 	font = wezterm.font("Iosevka"),
 	check_for_updates = false,
 	use_fancy_tab_bar = false,
 	tab_bar_at_bottom = true,
 	window_background_opacity = 0.95,
+	check_for_updates = false,
 	colors={
 		background = '#292929',
 		foreground = '#c9ad53',




diff --git a/.gitconfig b/.gitconfig
index 9750931504af00d5423c1b44305139c27e7204fb..369fd0626f8c5b1e641506d7e0ec2540e02f8d4a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,11 +1,11 @@
 [init]
 	defaultBranch = master
 [user]
-	name = Adam
-	email = git@apiote.xyz
-	signingkey = D5299134F42642A72D740EEB5A8C74D1318B549B
+	name = Adam Pioterek
+	email = apioterek@consdata.com
 [push]
 	default = simple
+	autoSetupRemote = true
 [core]
 	editor = hx
 	autocrlf = input




diff --git a/.gtkrc-2.0 b/.gtkrc-2.0
index 09b3255f644c4daf5bc5fec6d836ddab52f9ec08..f565ac6380a16cafa452236656bca0864222c7d2 100644
--- a/.gtkrc-2.0
+++ b/.gtkrc-2.0
@@ -1,3 +1,11 @@
+gtk-enable-animations=1
+gtk-primary-button-warps-slider=0
+gtk-toolbar-style=3
+gtk-menu-images=1
+gtk-button-images=1
+gtk-cursor-theme-size=24
+gtk-cursor-theme-name="Breeze_Amber"
 gtk-theme-name="Materia-dark"
-gtk-font-name="Fira Sans 11"
-gtk-icon-theme-name="Papirus-Dark"
+gtk-font-name="Noto Sans,  10"
+gtk-icon-theme-name="Paper"
+




diff --git a/.local/bin/kak b/.local/bin/kak
deleted file mode 100755
index a257c2d62374a215fb6f70ebce728bcc54778cd7..0000000000000000000000000000000000000000
--- a/.local/bin/kak
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-PATH=$(echo "$PATH" | sed "s|$HOME/.local/bin:||" | sed 's|.:||')
-
-if [ "$#" -gt 0 ] && [ -d "$1" ]
-then
-	kak -e "e $1"
-else
-	kak "$@"
-fi




diff --git a/.local/bin/photosArchive b/.local/bin/photosArchive
index dca2d7170582e31ae0ec4b4f2654f7b5766fbcb5..ba96b5e8aaeda868dfb7bd8a29910c468cd317d6 100755
--- a/.local/bin/photosArchive
+++ b/.local/bin/photosArchive
@@ -33,10 +33,10 @@ then
 	printf "No renaming\n"
 else
 	printf "Renaming\n"
-	rename '.JPG' '.jpg' ./*.JPG
-	exiv2 -F mv ./*.jpg
+	# rename '.JPG' '.jpg' ./*.JPG
+	# exiv2 -F mv ./*.jpg
 
-	rename '.MOV' '.mov' ./*.MOV
+	# rename '.MOV' '.mov' ./*.MOV
 	for film in ./*.mov
 	do
 		filmName=$(ffprobe -show_entries format_tags=creation_time "$film" 2>/dev/null | grep TAG: | cut -d '.' -f1 | sed 's/TAG:creation_time=//' | sed -E 's/(-|:)//g' | sed 's/T/_/')




diff --git a/.local/share/qalculate/definitions/datasets.xml b/.local/share/qalculate/definitions/datasets.xml
index 343933705343562d1a69fce5465ea6106a5e2ddf..b101fe65a5ef426d4f07ecf68ef02349fdb8419f 100644
--- a/.local/share/qalculate/definitions/datasets.xml
+++ b/.local/share/qalculate/definitions/datasets.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<QALCULATE version="4.5.1"/>
+<QALCULATE version="3.22.0"/>




diff --git a/.local/share/qalculate/definitions/functions.xml b/.local/share/qalculate/definitions/functions.xml
index 343933705343562d1a69fce5465ea6106a5e2ddf..b101fe65a5ef426d4f07ecf68ef02349fdb8419f 100644
--- a/.local/share/qalculate/definitions/functions.xml
+++ b/.local/share/qalculate/definitions/functions.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<QALCULATE version="4.5.1"/>
+<QALCULATE version="3.22.0"/>




diff --git a/.local/share/qalculate/definitions/units.xml b/.local/share/qalculate/definitions/units.xml
index 3bc4eb85957da24894284463b6f1bc88eb16a58d..e4be0d174bbc5536814eed87f6ae48cc452afa4c 100644
--- a/.local/share/qalculate/definitions/units.xml
+++ b/.local/share/qalculate/definitions/units.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<QALCULATE version="4.5.1">
+<QALCULATE version="3.22.0">
   <category>
     <title>Temperature</title>
     <deactivate>oC</deactivate>




diff --git a/.local/share/qalculate/definitions/variables.xml b/.local/share/qalculate/definitions/variables.xml
index a75a42100ce214315dd57902612c281ed4520605..b101fe65a5ef426d4f07ecf68ef02349fdb8419f 100644
--- a/.local/share/qalculate/definitions/variables.xml
+++ b/.local/share/qalculate/definitions/variables.xml
@@ -1,15 +1,2 @@
 <?xml version="1.0"?>
-<QALCULATE version="4.5.1">
-  <category>
-    <title>Unknowns</title>
-    <deactivate>x</deactivate>
-  </category>
-  <category>
-    <title>Temporar</title>
-    <variable>
-      <title>""</title>
-      <names>a:x</names>
-      <value>1</value>
-    </variable>
-  </category>
-</QALCULATE>
+<QALCULATE version="3.22.0"/>




diff --git a/.profile b/.profile
index 64b94882643b8191dcd8bf115affa3ec83424756..b80fa244fc4837d9f6fb9e7fe9e9292dd3a8c9b5 100644
--- a/.profile
+++ b/.profile
@@ -10,3 +10,15 @@ if [ "$(tty)" = "/dev/tty1" ] && command -v sway >/dev/null 2>&1
 then
 	sway
 fi
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+export PATH="$PATH:$HOME/.rvm/bin"
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+. "$HOME/.cargo/env"
+
+
+# Added by Toolbox App
+export PATH="$PATH:/home/users/apioterek/.local/share/JetBrains/Toolbox/scripts"
+
+ssh-agent -c > /tmp/ssh-agent.fish




diff --git a/.ssh/config b/.ssh/config
index e96ea91e3cf4531e8668748450395948aa13f378..bc51ad1b9bcd00260c39220f4a62dbabe243beac 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,3 +1,5 @@
+# https://carlosbecker.dev/posts/ssh-tips-and-tricks/ -- ControlPersist, key forwarding
+
 Host *
 	AddKeysToAgent yes
 
@@ -18,6 +20,7 @@ 	User adam
 	IdentityFile ~/.ssh/deepthought
 	IdentityFile ~/.ssh/deepthought_backup
 	ProxyCommand /usr/bin/nc -x 127.0.0.1:10080 localhost 22
+	ServerAliveInterval 30
 	IdentitiesOnly yes
 Host apiote-zapas
 	User adam
@@ -25,4 +28,45 @@ 	ProxyJump apiote@ssh-j.com
 	Hostname deepthought
 	IdentityFile ~/.ssh/deepthought
 	IdentityFile ~/.ssh/deepthought_backup
+	ServerAliveInterval 30
 	IdentitiesOnly yes
+
+Host *.consdata.local
+	User root
+	IdentityFile ~/.ssh/consdata
+	PubkeyAcceptedAlgorithms +ssh-rsa
+	HostkeyAlgorithms +ssh-rsa
+Host gitlab.centrala.bzwbk
+	IdentityFile ~/.ssh/santander
+Host 172.19.10.140
+	User root
+	IdentityFile ~/.ssh/consdata
+	PubkeyAcceptedAlgorithms +ssh-rsa
+	HostkeyAlgorithms +ssh-rsa
+Host jenkins*
+	User root
+	IdentityFile ~/.ssh/consdata
+Host hermes
+	User root
+	IdentityFile ~/.ssh/consdata
+Host wiki
+	User root
+	IdentityFile ~/.ssh/consdata
+Host jira
+	User root
+	IdentityFile ~/.ssh/consdata
+Host backup-workstations
+	User adm_apioterek
+	IdentityFile ~/.ssh/consdata
+Host router*
+	User adm_apioterek
+	IdentityFile ~/.ssh/consdata
+Host storage-*
+	User adm_apioterek
+	IdentityFile ~/.ssh/consdata
+Host files
+	User adm_apioterek
+	IdentityFile ~/.ssh/consdata
+Host swagger
+	User root
+	IdentityFile ~/.ssh/consdata