From 3991184cda87f418f41fde137acf2cfe52936dcd Mon Sep 17 00:00:00 2001 From: Felix Steghofer Date: Sun, 28 Feb 2021 00:43:32 +0100 Subject: [PATCH] update --- .config/gtk-3.0/settings.ini | 21 ++++++++++++------- .config/i3/config | 3 +-- .config/polybar/player-mpris-simple.sh | 6 +++--- .config/terminator/config | 29 ++++++++++++++++++++++++++ .gitconfig | 2 ++ .zsh/aliases.zsh | 4 +--- .zshrc | 10 +++++++-- 7 files changed, 57 insertions(+), 18 deletions(-) create mode 100644 .config/terminator/config diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index a50a394..e157989 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,15 +1,20 @@ [Settings] -gtk-theme-name=Arc -gtk-font-name=Liberation Sans 11 -gtk-icon-theme-name=Arc +gtk-application-prefer-dark-theme=true +gtk-button-images=true gtk-cursor-theme-name=Adwaita -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=icon:minimize,maximize,close +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=breeze-dark +gtk-menu-images=true +gtk-modules=colorreload-gtk-module:window-decorations-gtk-module +gtk-primary-button-warps-slider=false +gtk-theme-name=Breeze +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/i3/config b/.config/i3/config index 9cb3208..d7b1ffb 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -289,7 +289,6 @@ exec --no-startup-id nm-applet exec libinput-gestures-setup start exec --no-startup-id clipit exec insync start -# auto started by browser -#exec keepassxc +exec keepassxc exec google-chrome-stable exec synclient TouchpadOff=1 diff --git a/.config/polybar/player-mpris-simple.sh b/.config/polybar/player-mpris-simple.sh index d0c3c86..06ecccc 100755 --- a/.config/polybar/player-mpris-simple.sh +++ b/.config/polybar/player-mpris-simple.sh @@ -1,11 +1,11 @@ #!/bin/sh -player_status=$(playerctl status 2> /dev/null) +player_status=$(playerctl --player=spotify status 2> /dev/null) if [ "$player_status" = "Playing" ]; then - echo "ﱘ $(playerctl metadata artist) - $(playerctl metadata title) %{A1:playerctl previous:}玲%{A} %{A1:playerctl play-pause:} %{A} %{A1:playerctl next:}怜%{A}" + echo "ﱘ $(playerctl --player=spotify metadata artist) - $(playerctl --player=spotify metadata title) %{A1:playerctl --player=spotify previous:}玲%{A} %{A1:playerctl --player=spotify play-pause:} %{A} %{A1:playerctl --player=spotify next:}怜%{A}" elif [ "$player_status" = "Paused" ]; then - echo "ﱘ $(playerctl metadata artist) - $(playerctl metadata title) %{A1:playerctl previous:}玲%{A} %{A1:playerctl play-pause:} 契%{A} %{A1:playerctl next:}怜%{A}" + echo "ﱘ $(playerctl --player=spotify metadata artist) - $(playerctl --player=spotify metadata title) %{A1:playerctl --player=spotify previous:}玲%{A} %{A1:playerctl --player=spotify play-pause:} 契%{A} %{A1:playerctl --player=spotify next:}怜%{A}" else echo "" fi diff --git a/.config/terminator/config b/.config/terminator/config new file mode 100644 index 0000000..0c3db76 --- /dev/null +++ b/.config/terminator/config @@ -0,0 +1,29 @@ +[global_config] + window_state = fullscreen + borderless = True + extra_styling = False + broadcast_default = off + title_hide_sizetext = True + title_transmit_bg_color = "#888a85" + enabled_plugins = LaunchpadBugURLHandler, + smart_copy = False +[keybindings] +[profiles] + [[default]] + background_color = "#282828" + background_darkness = 0.9 + cursor_color = "#aaaaaa" + foreground_color = "#ebdbb2" + show_titlebar = False + scrollbar_position = hidden + scrollback_lines = 10000 + palette = "#282828:#cc241d:#98971a:#d79921:#458588:#b16286:#689d6a:#a89984:#928374:#fb4934:#b8bb26:#fabd2f:#83a598:#d3869b:#8ec07c:#ebdbb2" +[layouts] + [[default]] + [[[child1]]] + parent = window0 + type = Terminal + [[[window0]]] + parent = "" + type = Window +[plugins] diff --git a/.gitconfig b/.gitconfig index f8ce751..5cfaa87 100644 --- a/.gitconfig +++ b/.gitconfig @@ -20,3 +20,5 @@ [alias] quick-stats = ! /usr/local/bin/git-quick-stats +[pull] + rebase = false diff --git a/.zsh/aliases.zsh b/.zsh/aliases.zsh index 8d377da..bc435eb 100644 --- a/.zsh/aliases.zsh +++ b/.zsh/aliases.zsh @@ -29,7 +29,7 @@ alias mv='mv -iv' # ARCH # pacman shortcuts: # This one is dangerous!! -alias pacman='pacaur' +alias pacman='yay' alias P="sudo pacman" alias S="P -S" alias Syu="P -Syu" @@ -110,8 +110,6 @@ alias xclip='xclip -selection clipboard' alias ga='git add' alias gaa='git add --all' alias gb='git branch' -alias go='git checkout' -alias gob='git checkout -b' alias gcl='git clone' alias gd='git diff --ignore-space-change ' alias gdc='git diff --cached' diff --git a/.zshrc b/.zshrc index 06bc7d3..67419e5 100644 --- a/.zshrc +++ b/.zshrc @@ -1,9 +1,10 @@ ##### ENVIRONMENT export PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/usr/bin/core_perl:/home/felix/bin + export LANG=en_US.UTF-8 -export EDITOR='code' -export GIT_EDITOR='code' +export EDITOR='vim' +export GIT_EDITOR='vim' export PAGER='most' export SHELL="/bin/zsh" export TERM=xterm @@ -11,6 +12,7 @@ export BROWSER='/usr/bin/google-chrome-stable' export ANDROID_SDK_ROOT=/opt/android-sdk export PATH=$PATH:/opt/android-sdk/platform-tools:/opt/android-sdk/tools +export PATH=$PATH:~/.platformio/penv/bin # colors for less without compiled termcap files (curses feature) export LESS_TERMCAP_mb=$'\e[01;31m' @@ -216,10 +218,14 @@ source ~/.zsh/git-prompt/loader.sh # stuff for development (e.g. nvm) if [ "$(hostname)" = "t480" ]; then # source ~/.zsh/dev-machine.zsh +# export NVM_DIR=~/.nvm +# sh $NVM_DIR/nvm.sh # underline hostname PROMPT='%* %B%{%}%n%{%}@%U%m%u %{%}%~%b $(git_super_status) %# ' fi +source <(kubectl completion zsh) + if [ -z "$DISPLAY" -a $XDG_VTNR -eq 1 ]; then startx fi