From 9b89946ea4f1a396276590799ebfc63b598a84a2 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 29 May 2018 01:18:31 +0100 Subject: [PATCH 1/9] Add Breeze Obsidian as X11 cursor --- .config/X11/xresources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/X11/xresources b/.config/X11/xresources index c616922..7401c4f 100644 --- 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 !! From b7ef22f4f6d2b2beea07137dc5bc1a21429ff969 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 29 May 2018 01:21:53 +0100 Subject: [PATCH 2/9] i3: Alias Alt Mod1 as $mod --- .config/i3/config | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index 6c945b5..1b17167 100644 --- 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 @@ -73,10 +74,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 @@ -167,7 +168,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 \\"$LINK\\"" From 2b2e963c2ad3a3665c5eb500d0e26b5eae657a73 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 29 May 2018 01:22:23 +0100 Subject: [PATCH 3/9] aliases: dalpine uses spritsail/alpine now --- aliases | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases b/aliases index cd9732e..d515211 100644 --- a/aliases +++ b/aliases @@ -176,7 +176,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' From f1a353aed58c371bbb62484ac7eea4758b62f576 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 5 Jun 2018 23:15:27 +0100 Subject: [PATCH 4/9] rofi: fix hi-dpi scaling See also: https://github.com/DaveDavenport/rofi/issues/815 --- .config/rofi/config | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.config/rofi/config b/.config/rofi/config index d563b04..b8785b2 100644 --- a/.config/rofi/config +++ b/.config/rofi/config @@ -6,12 +6,13 @@ rofi.color-window: #F2383C4A, #2F343F rofi.color-normal: #00383C4A, #D3DAE3, #00383C4A, #5294E2, #ECEFF1 rofi.bc: #CC383C4A -rofi.bw: 5 -rofi.padding: 8 +rofi.dpi: 0 +rofi.bw: 12em +rofi.padding: 20em rofi.lines: 12 rofi.width: 40 -rofi.font: Noto Sans 14 -rofi.line-margin: 6 +rofi.font: sans 14 +rofi.line-margin: 12em rofi.sep: | rofi.prompt: > rofi.ssh-command: {terminal} -e "{ssh-client} {host}" From 7597a300f4ee9e1e1d1e6b29755037e4edc285a2 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Mon, 11 Jun 2018 04:11:58 +0100 Subject: [PATCH 5/9] profile: Improve busybox/ash compatibility --- .profile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.profile b/.profile index 48af925..f8386b0 100644 --- a/.profile +++ b/.profile @@ -12,9 +12,9 @@ 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 DOTFILES="$(dirname "${thisfile:-$XDG_CONFIG_HOME/dotfiles/.profile}")" export PATH="${PATH}:$DOTFILES/scripts" # Override paths for non-compliant programs From 1418a516269831312fc9a20481b424cd2cf0f705 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Mon, 11 Jun 2018 13:24:03 +0100 Subject: [PATCH 6/9] qt: fix GTK styling for QT5 --- .config/X11/xinitrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc index 3131ec9..ef95847 100644 --- a/.config/X11/xinitrc +++ b/.config/X11/xinitrc @@ -24,6 +24,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 From d7f1a2193daf09c4497baf4ff13d617c5ef8241b Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Mon, 11 Jun 2018 13:24:42 +0100 Subject: [PATCH 7/9] gopass: update to 1.8.0 --- .config/gopass/config.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.config/gopass/config.yml b/.config/gopass/config.yml index a39fbb8..c2f463d 100644 --- 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 From 3bcb38f9f21cf33c2485de83c26ebdc47a032f56 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Fri, 15 Jun 2018 10:13:56 +0100 Subject: [PATCH 8/9] rofi: update to use rasi theming --- .config/rofi/arc-dark.rasi | 42 +++++++++++ .config/rofi/config | 27 ------- .config/rofi/config.rasi | 145 +++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+), 27 deletions(-) create mode 100644 .config/rofi/arc-dark.rasi delete mode 100644 .config/rofi/config create mode 100644 .config/rofi/config.rasi diff --git a/.config/rofi/arc-dark.rasi b/.config/rofi/arc-dark.rasi new file mode 100644 index 0000000..f755c51 --- /dev/null +++ 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 */ diff --git a/.config/rofi/config b/.config/rofi/config deleted file mode 100644 index b8785b2..0000000 --- a/.config/rofi/config +++ /dev/null @@ -1,27 +0,0 @@ -!----------------------------- -! Rofi config -!----------------------------- - -! State: 'bg', 'fg', 'bgalt' 'hlbg', 'hlfg' -rofi.color-window: #F2383C4A, #2F343F -rofi.color-normal: #00383C4A, #D3DAE3, #00383C4A, #5294E2, #ECEFF1 -rofi.bc: #CC383C4A -rofi.dpi: 0 -rofi.bw: 12em -rofi.padding: 20em -rofi.lines: 12 -rofi.width: 40 -rofi.font: sans 14 -rofi.line-margin: 12em -rofi.sep: | -rofi.prompt: > -rofi.ssh-command: {terminal} -e "{ssh-client} {host}" -rofi.separator-style: solid -rofi.kb-row-tab: Shift+Tab -rofi.kb-row-select: Tab - -rofi.matching: glob -rofi.tokenize: true -rofi.normal-window: true - -! vim: ft=xdefaults diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi new file mode 100644 index 0000000..f4fa49a --- /dev/null +++ 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 */ From 94c3cb5741aaf0a789f2f1f9e59996b0cebcbfc3 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 23 Jun 2018 23:49:11 +0100 Subject: [PATCH 9/9] aliases: add UID to dalpine --- aliases | 1 + 1 file changed, 1 insertion(+) diff --git a/aliases b/aliases index d515211..3560735 100644 --- a/aliases +++ b/aliases @@ -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 \