Author: Adam <git@apiote.xyz>
dotfiles unification
.config/fish/config.fish | 6 ++++-- .config/gtk-3.0/settings.ini | 10 +++++----- .config/kak/autoload/autoload | 2 +- .config/mpv/mpv.conf | 4 ++-- .gitconfig | 5 +++-- .gtkrc-2.0 | 4 ++-- .local/bin/photosArchive | 6 +++--- .profile | 17 ++++++++++-------
diff --git a/.config/fish/config.fish b/.config/fish/config.fish index c846d9c57234ded9ca028eb1de57d736033e3332..22860d5f11bb1b2f4edb091ed6f55345552bd598 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -47,14 +47,16 @@ if [ -f /tmp/ssh-agent.fish ] . /tmp/ssh-agent.fish >/dev/null else - ssh-agent -c >/tmp/ssh-agent.fish + if [ (hostname) != 'Marvin' ] + ssh-agent -c >/tmp/ssh-agent.fish + end end if [ -f /tmp/dbus.fish ] . /tmp/dbus.fish >/dev/null end -if [ (hostname) = 'Marvin' ] +if [ (hostname) != 'Mycroft' ] if ! pgrep glider >/dev/null glider -listen socks5://:10080 -forward wss://shell.apiote.xyz & disown diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 60852f3f87f666fc1965787b79923c59736fa979..5b9266b416c2db7d31b044857befcbce2ef0cb97 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -2,19 +2,19 @@ [Settings] gtk-application-prefer-dark-theme=true gtk-button-images=true gtk-cursor-theme-name=Breeze_Amber -gtk-cursor-theme-size=24 +gtk-cursor-theme-size=0 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-font-name=Fira Sans 11 +gtk-icon-theme-name=Papirus-Dark gtk-menu-images=true gtk-modules=colorreload-gtk-module gtk-primary-button-warps-slider=false -gtk-theme-name=Materia-dark +gtk-theme-name=Materia gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-toolbar-style=3 +gtk-toolbar-style=GTK_TOOLBAR_BOTH 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 20a3f888478caf4b25aa84bee31fb67567f93538..a406aeabd031fa17b9380c640d9bf333b5bb41e0 120000 --- a/.config/kak/autoload/autoload +++ b/.config/kak/autoload/autoload @@ -1 +1 @@ -/usr/local/share/kak/autoload/ \ No newline at end of file +/usr/share/kak/autoload/ \ No newline at end of file diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 1cda30321b3d3c5eaeb3af180fdc78ddc53f3e83..170940d32a002ff5223538a7344abc312f2537d7 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/.gitconfig b/.gitconfig index 369fd0626f8c5b1e641506d7e0ec2540e02f8d4a..3d1991ba1bbd9075133b7123e13764fa47698487 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,8 +1,9 @@ [init] defaultBranch = master [user] - name = Adam Pioterek - email = apioterek@consdata.com + name = Adam + email = git@apiote.xyz + signingkey = D5299134F42642A72D740EEB5A8C74D1318B549B [push] default = simple autoSetupRemote = true diff --git a/.gtkrc-2.0 b/.gtkrc-2.0 index f565ac6380a16cafa452236656bca0864222c7d2..4b5cb871212865152308e23ff3c7e09e371ef77f 100644 --- a/.gtkrc-2.0 +++ b/.gtkrc-2.0 @@ -6,6 +6,6 @@ gtk-button-images=1 gtk-cursor-theme-size=24 gtk-cursor-theme-name="Breeze_Amber" gtk-theme-name="Materia-dark" -gtk-font-name="Noto Sans, 10" -gtk-icon-theme-name="Paper" +gtk-font-name="Fira Sans 11" +gtk-icon-theme-name="Papirus-dark" diff --git a/.local/bin/photosArchive b/.local/bin/photosArchive index ba96b5e8aaeda868dfb7bd8a29910c468cd317d6..dca2d7170582e31ae0ec4b4f2654f7b5766fbcb5 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/.profile b/.profile index b80fa244fc4837d9f6fb9e7fe9e9292dd3a8c9b5..d9d310d604faece15cc018b8b2f3a5415d1e914a 100644 --- a/.profile +++ b/.profile @@ -11,14 +11,17 @@ 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" +if [ $(hostname) = 'L100' ] +then + 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" + # Added by Toolbox App + export PATH="$PATH:/home/users/apioterek/.local/share/JetBrains/Toolbox/scripts" +fi ssh-agent -c > /tmp/ssh-agent.fish