Merge remote-tracking branch 'origin/master' into surface

2024-06-14 12:57:23 +00:00 · 2018-07-07 16:24:41 +01:00 · 2018-07-07 16:24:41 +01:00 · 015fffbbd4
commit 015fffbbd4
parent 22fa8c810f 94c3cb5741
8 changed files with 216 additions and 14 deletions
--- a/.config/X11/xinitrc
+++ b/.config/X11/xinitrc
@ -25,6 +25,7 @@ export TERMINAL="termite"
 export BROWSER="chromium"
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
 export QT_QPA_PLATFORMTHEME=gtk2
+export QT_STYLE_OVERRIDE=gtk2
 export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open

 # Merge system clipboards
--- a/.config/X11/xresources
+++ b/.config/X11/xresources
@ -36,7 +36,7 @@ Xft.hinting:    true
 Xft.hintstyle:  hintfull
 Xft.lcdfilter:  lcddefault

-
+Xcursor.theme: Breeze_Obsidian

 !!======================!!
 !! RXVT-unicode setting !!
--- a/.config/gopass/config.yml
+++ b/.config/gopass/config.yml
@ -1,24 +1,36 @@
 root:
  askformore: false
+  autoclip: false
  autoimport: true
  autosync: true
+  check_recipient_hash: false
  cliptimeout: 45
+  concurrency: 1
+  editrecipients: false
+  nocolor: false
  noconfirm: false
  nopager: false
-  path: /home/frebib/.local/share/pass
+  notifications: false
+  path: gpgcli-gitcli-fs+file:///home/frebib/.local/share/pass
+  recipient_hash: {}
  safecontent: false
  usesymbols: false
-  nocolor: false
 mounts:
  spritsail:
    askformore: false
+    autoclip: false
    autoimport: true
    autosync: true
+    check_recipient_hash: false
    cliptimeout: 45
+    concurrency: 1
+    editrecipients: false
+    nocolor: false
    noconfirm: false
    nopager: false
-    path: /home/frebib/.local/share/pass-spritsail
+    notifications: false
+    path: gpgcli-gitcli-fs+file:///home/frebib/.local/share/pass-spritsail
+    recipient_hash: {}
    safecontent: false
    usesymbols: false
-    nocolor: false
-version: 1.6.10
+version: 1.8.0
--- a/.config/i3/config
+++ b/.config/i3/config
@ -3,13 +3,14 @@
 # Please see http://i3wm.org/docs/userguide.html for a complete reference!

 set $mod Mod4
+set $alt Mod1
 floating_modifier $mod

 font pango:Noto Sans 9

 # kill focused window
 bindsym $mod+apostrophe kill
-bindsym Mod1+F4 kill
+bindsym $alt+F4 kill

 # change window focus
 bindsym $mod+d focus left
@ -60,10 +61,10 @@ bindsym $mod+9 workspace 9
 bindsym $mod+0 workspace $10

 # move workspaces across screens
-bindsym $mod+Mod1+d move workspace to output left
-bindsym $mod+Mod1+n move workspace to output right
-bindsym $mod+Mod1+t move workspace to output up
-bindsym $mod+Mod1+h move workspace to output down
+bindsym $mod+$alt+d move workspace to output left
+bindsym $mod+$alt+n move workspace to output right
+bindsym $mod+$alt+t move workspace to output up
+bindsym $mod+$alt+h move workspace to output down

 # move focused container to workspace
 bindsym $mod+Shift+1 move container to workspace 1
@ -152,7 +153,7 @@ bindsym $mod+Shift+p exec rofi-pass
 bindsym $mod+Shift+e exec rofi-emoji
 bindsym --release Print        exec imgur-screenshot
 bindsym --release $mod+Print   exec imgur-screenshot -f
-bindsym $mod+Mod1+space exec --no-startup-id ~/.config/i3/cycleaudio.py && pkill -RTMIN+10 i3blocks
+bindsym $mod+$alt+space exec --no-startup-id ~/.config/i3/cycleaudio.py && pkill -RTMIN+10 i3blocks
 bindsym $mod+numbersign exec "termite -e 'sh -c xclip\ -o\ |\ gpg\ --decrypt\ 2>&1\ \;\ $SHELL'"
 bindsym $mod+r       exec "bash -c 'pwgen -nc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i'"
 bindsym $mod+g       exec "LINK=$(gist -PRpc); notify-send -c transfer \\"<a href=\\\\"$LINK\\\\">$LINK</a>\\""
--- a/.config/rofi/arc-dark.rasi
+++ b/.config/rofi/arc-dark.rasi
@ -0,0 +1,42 @@
+* {
+  background-color: transparent;
+  text-color:       #D3DAE3;
+  border-color:     @text-color;
+}
+
+window {
+  border:           0.3em;
+  border-color:     #2f343f;
+  padding:          0.8em;
+  background-color: rgba(56, 60, 74, 0.9);
+  transparency:     "real";
+}
+
+inputbar {
+  padding:          0 0 0.3em;
+  border:           0 0 0.1em;
+}
+prompt {
+  padding:          0 0.4em 0 0.2em;
+}
+
+listview {
+  padding:          0.3em 0;
+}
+element {
+  padding:          0.1em 0.2em;
+}
+
+button {
+  border:           0 0 0.1em;
+  border-color:     transparent;
+}
+button.selected.normal {
+  border-color:     @text-color;
+}
+
+element.selected.normal {
+  background-color: rgb(64, 132, 214);
+}
+
+/* vim: ft=css sw=2 */
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@ -0,0 +1,145 @@
+configuration {
+  theme: "arc-dark";
+  font: "sans 14";
+  dpi: 0;
+  width: 40;
+  lines: 12;
+
+  /* show-icons: true; */
+  separator-style: "solid";
+  modi: "window,run,ssh";
+  kb-row-tab: "Shift-Tab";
+  kb-row-select: "Tab";
+  terminal: "i3-sensible-terminal";
+
+  matching: "glob";
+  tokenize: true;
+
+/*  columns: 1;*/
+/*  bw: 1;*/
+/*  location: 0;*/
+/*  padding: 5;*/
+/*  yoffset: 0;*/
+/*  xoffset: 0;*/
+/*  fixed-num-lines: true;*/
+/*  ssh-client: "ssh";*/
+/*  ssh-command: "{terminal} -e {ssh-client} {host}";*/
+/*  run-command: "{cmd}";*/
+/*  run-list-command: "";*/
+/*  run-shell-command: "{terminal} -e {cmd}";*/
+/*  window-command: "xkill -id {window}";*/
+/*  window-match-fields: "all";*/
+/*  drun-icon-theme: ;*/
+/*  drun-match-fields: "name,generic,exec,categories";*/
+/*  disable-history: false;*/
+/*  sort: false;*/
+/*  levenshtein-sort: false;*/
+/*  case-sensitive: false;*/
+/*  cycle: true;*/
+/*  sidebar-mode: false;*/
+/*  eh: 1;*/
+/*  auto-select: false;*/
+/*  parse-hosts: false;*/
+/*  parse-known-hosts: true;*/
+/*  combi-modi: "window,run";*/
+/*  m: "-5";*/
+/*  line-margin: 2;*/
+/*  line-padding: 1;*/
+/*  filter: ;*/
+/*  hide-scrollbar: false;*/
+/*  fullscreen: false;*/
+/*  fake-transparency: false;*/
+/*  dpi: -1;*/
+/*  threads: 0;*/
+/*  scrollbar-width: 8;*/
+/*  scroll-method: 0;*/
+/*  fake-background: "screenshot";*/
+/*  window-format: "{w}    {i}{c}   {t}";*/
+/*  click-to-exit: true;*/
+/*  show-match: true;*/
+/*  color-normal: ;*/
+/*  color-urgent: ;*/
+/*  color-active: ;*/
+/*  color-window: ;*/
+/*  max-history-size: 25;*/
+/*  combi-hide-mode-prefix: false;*/
+/*  pid: "/run/user/1000/rofi.pid";*/
+/*  display-window: ;*/
+/*  display-windowcd: ;*/
+/*  display-run: ;*/
+/*  display-ssh: ;*/
+/*  display-drun: ;*/
+/*  display-combi: ;*/
+/*  display-keys: ;*/
+/*  kb-primary-paste: "Control+V,Shift+Insert";*/
+/*  kb-secondary-paste: "Control+v,Insert";*/
+/*  kb-clear-line: "Control+w";*/
+/*  kb-move-front: "Control+a";*/
+/*  kb-move-end: "Control+e";*/
+/*  kb-move-word-back: "Alt+b";*/
+/*  kb-move-word-forward: "Alt+f";*/
+/*  kb-move-char-back: "Left,Control+b";*/
+/*  kb-move-char-forward: "Right,Control+f";*/
+/*  kb-remove-word-back: "Control+Alt+h,Control+BackSpace";*/
+/*  kb-remove-word-forward: "Control+Alt+d";*/
+/*  kb-remove-char-forward: "Delete,Control+d";*/
+/*  kb-remove-char-back: "BackSpace,Control+h";*/
+/*  kb-remove-to-eol: "Control+k";*/
+/*  kb-remove-to-sol: "Control+u";*/
+/*  kb-accept-entry: "Control+j,Control+m,Return,KP_Enter";*/
+/*  kb-accept-custom: "Control+Return";*/
+/*  kb-accept-alt: "Shift+Return";*/
+/*  kb-delete-entry: "Shift+Delete";*/
+/*  kb-mode-next: "Shift+Right,Control+Tab";*/
+/*  kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab";*/
+/*  kb-row-left: "Control+Page_Up";*/
+/*  kb-row-right: "Control+Page_Down";*/
+/*  kb-row-up: "Up,Control+p,ISO_Left_Tab";*/
+/*  kb-row-down: "Down,Control+n";*/
+/*  kb-page-prev: "Page_Up";*/
+/*  kb-page-next: "Page_Down";*/
+/*  kb-row-first: "Home,KP_Home";*/
+/*  kb-row-last: "End,KP_End";*/
+/*  kb-screenshot: "Alt+S";*/
+/*  kb-toggle-case-sensitivity: "grave,dead_grave";*/
+/*  kb-toggle-sort: "Alt+grave";*/
+/*  kb-cancel: "Escape,Control+g,Control+bracketleft";*/
+/*  kb-custom-1: "Alt+1";*/
+/*  kb-custom-2: "Alt+2";*/
+/*  kb-custom-3: "Alt+3";*/
+/*  kb-custom-4: "Alt+4";*/
+/*  kb-custom-5: "Alt+5";*/
+/*  kb-custom-6: "Alt+6";*/
+/*  kb-custom-7: "Alt+7";*/
+/*  kb-custom-8: "Alt+8";*/
+/*  kb-custom-9: "Alt+9";*/
+/*  kb-custom-10: "Alt+0";*/
+/*  kb-custom-11: "Alt+exclam";*/
+/*  kb-custom-12: "Alt+at";*/
+/*  kb-custom-13: "Alt+numbersign";*/
+/*  kb-custom-14: "Alt+dollar";*/
+/*  kb-custom-15: "Alt+percent";*/
+/*  kb-custom-16: "Alt+dead_circumflex";*/
+/*  kb-custom-17: "Alt+ampersand";*/
+/*  kb-custom-18: "Alt+asterisk";*/
+/*  kb-custom-19: "Alt+parenleft";*/
+/*  kb-select-1: "Super+1";*/
+/*  kb-select-2: "Super+2";*/
+/*  kb-select-3: "Super+3";*/
+/*  kb-select-4: "Super+4";*/
+/*  kb-select-5: "Super+5";*/
+/*  kb-select-6: "Super+6";*/
+/*  kb-select-7: "Super+7";*/
+/*  kb-select-8: "Super+8";*/
+/*  kb-select-9: "Super+9";*/
+/*  kb-select-10: "Super+0";*/
+/*  ml-row-left: "ScrollLeft";*/
+/*  ml-row-right: "ScrollRight";*/
+/*  ml-row-up: "ScrollUp";*/
+/*  ml-row-down: "ScrollDown";*/
+/*  me-select-entry: "MousePrimary";*/
+/*  me-accept-entry: "MouseDPrimary";*/
+/*  me-accept-custom: "Control+MouseDPrimary";*/
+}
+
+/* vim: ft=css sw=2 */
--- a/.profile
+++ b/.profile
@ -12,7 +12,7 @@ mkdir -p "$XDG_CONFIG_HOME" "$XDG_CACHE_HOME" "$XDG_DATA_HOME" "$XDG_LOCAL_HOME"
 case "$(basename "$(readlink -f /proc/$$/exe)")" in
    zsh)  thisfile="$(readlink -f "${(%):-%N}")";;
    bash) thisfile="$(readlink -f "${BASH_SOURCE[0]}")";;
-    *)   thisfile="$(find /proc/$$/fd/ | xargs readlink -f | grep .profile | head -n1)";;
+    *)   thisfile="$(find /proc/$$/fd/ | xargs -n1 -r readlink -f | grep profile | head -n1)";;
 esac
 export DOTFILES="$(dirname "${thisfile:-$XDG_CONFIG_HOME/dotfiles}")"
 export PATH="${PATH}:$DOTFILES/scripts:$HOME/.local/share/surface-scripts"
--- a/3
+++ b/3
@ -67,6 +67,7 @@ alias acmesh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh -
 exists gopass && alias pass='gopass'
 alias abuild='docker run -ti --rm \
    -e USER \
+    -e UID="$(id -u)" \
    -e PWD \
    -e HOME \
    -w $PWD \
@ -176,7 +177,7 @@ alias drst='docker restart'
 alias dnet='docker network'
 alias dvol='docker volume'
 alias dlg='docker logs -f'
-alias dalpine='docker run -ti --rm alpine /bin/sh'
+alias dalpine='docker run -ti --rm spritsail/alpine /bin/sh'
 alias drm-stopped='docker container prune'
 alias drmi-untag='docker image prune'
 alias dprune='docker system prune -f'