diff options
| -rw-r--r-- | awesome/rc.lua | 29 | ||||
| -rw-r--r-- | awesome/theme/theme.lua | 6 | ||||
| -rw-r--r-- | bashrc | 2 | ||||
| -rwxr-xr-x | bspwm/bspwmrc | 17 | ||||
| -rwxr-xr-x | bspwm/panel | 2 | ||||
| -rwxr-xr-x | bspwm/panel_bar | 26 | ||||
| -rw-r--r-- | conkyrc | 6 | ||||
| -rw-r--r-- | emacs.d/Drobillarized-theme.el | 245 | ||||
| -rw-r--r-- | emacs.d/init.el | 17 | ||||
| -rw-r--r-- | sxhkd/sxhkdrc | 16 |
10 files changed, 190 insertions, 176 deletions
diff --git a/awesome/rc.lua b/awesome/rc.lua index fa8b7c0..9f9888a 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -143,14 +143,10 @@ vicious.register(tempwidget, get_temps, '$1', 4) --vicious.register(hddtempwidget, vicious.widgets.hddtemp, "${/dev/sda} °C", refresh_delay) -- Network ---ethwidget = widget({ type = "textbox" }) ---vicious.register(ethwidget, vicious.widgets.net, ---'Eth: <span color="#F88">${eth0 down_kb}</span>' .. ---'/<span color="#8F8">${eth0 up_kb}</span>', 3) -ethwidget = widget({ type = "textbox" }) -vicious.register(ethwidget, vicious.widgets.net, -'Eth <span color="#F88">${eth0 down_kb}</span>' .. -'/<span color="#8F8">${eth0 up_kb}</span>', 4) +-- ethwidget = widget({ type = "textbox" }) +-- vicious.register(ethwidget, vicious.widgets.net, +-- 'Eth <span color="#F88">${eth0 down_kb}</span>' .. +-- '/<span color="#8F8">${eth0 up_kb}</span>', 4) wlanwidget = widget({ type = "textbox" }) vicious.register(wlanwidget, vicious.widgets.net, 'Wifi <span color="#F88">${wlan0 down_kb}</span>' .. @@ -208,7 +204,8 @@ mytasklist.buttons = awful.util.table.join( for s = 1, screen.count() do -- CPU usage graph cpuwidget = awful.widget.graph() - cpuwidget:set_width(32) + cpuwidget:set_width(48) + cpuwidget:set_height(32) cpuwidget:set_background_color("#494B52") cpuwidget:set_color("#0092E6") vicious.cache(vicious.widgets.cpu) @@ -216,7 +213,8 @@ for s = 1, screen.count() do -- Memory usage graph memwidget = awful.widget.graph() - memwidget:set_width(32) + memwidget:set_width(48) + memwidget:set_height(32) memwidget:set_background_color("#49524B") memwidget:set_color("#AAF5D0") vicious.cache(vicious.widgets.mem) @@ -250,7 +248,7 @@ for s = 1, screen.count() do cpuwidget, separator, memwidget, separator, bar, tempwidget, bar, - ethwidget, bar, + -- ethwidget, bar, wlanwidget, bar, mypromptbox[s], separator, layout = awful.widget.layout.horizontal.leftright @@ -303,6 +301,15 @@ globalkeys = awful.util.table.join( end end), + -- Special keys + awful.key({ }, "XF86MonBrightnessDown", function () awful.util.spawn("xbacklight -dec 15") end), + awful.key({ }, "XF86MonBrightnessUp", function () awful.util.spawn("xbacklight -inc 15") end), + awful.key({ }, "XF86KbdBrightnessDown", function () awful.util.spawn("/home/drobilla/bin/kbdled.sh down") end), + awful.key({ }, "XF86KbdBrightnessUp", function () awful.util.spawn("/home/drobilla/bin/kbdled.sh up") end), + awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer sset Master 5%+") end), + awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer sset Master 5%-") end), + awful.key({ }, "XF86AudioMute", function () awful.util.spawn("amixer sset Master 0%") end), + -- Standard program awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), awful.key({ modkey, }, "\\", function () awful.util.spawn("nautilus -n --no-desktop") end), diff --git a/awesome/theme/theme.lua b/awesome/theme/theme.lua index dce3884..860110e 100644 --- a/awesome/theme/theme.lua +++ b/awesome/theme/theme.lua @@ -4,7 +4,7 @@ theme = {} -theme.font = "DejaVu Sans 10" +theme.font = "Sans 16" theme.bg_focus = "#3F3F3F" theme.bg_minimize = "#444444" @@ -40,8 +40,8 @@ theme.tasklist_floating_icon = "/usr/share/awesome/themes/default/tasklist/float -- menu_[bg|fg]_[normal|focus] -- menu_[border_color|border_width] theme.menu_submenu_icon = "/home/drobilla/.config/awesome/theme/submenu.png" -theme.menu_height = "18" -theme.menu_width = "128" +theme.menu_height = "24" +theme.menu_width = "256" -- You can add as many variables as -- you wish and access them by using @@ -79,6 +79,8 @@ export CFLAGS="-O2 -march=native -fomit-frame-pointer -DNDEBUG -ftree-vectorize" export CXXFLAGS="$CFLAGS" export GTK_IM_MODULE="xim" export EDITOR="emacsclient" +export CXX=/usr/lib/ccache/g++-6 +export CC=/usr/lib/ccache/gcc-6 # colorize man man() { diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc index efeb927..2e02ac8 100755 --- a/bspwm/bspwmrc +++ b/bspwm/bspwmrc @@ -1,11 +1,12 @@ #! /bin/sh export PANEL_FIFO=/home/drobilla/bspwmpanel.fifo -export PANEL_HEIGHT=18 -export PANEL_FONT="DejaVu Sans Mono-11" -export TRAY_HEIGHT=16 +export PANEL_HEIGHT=48 +export PANEL_FONT="DejaVu Sans Mono-16" +export TRAY_HEIGHT=28 export SCREEN_WIDTH="$(xrandr | grep '*' | sed 's/ *\([0-9]*\)x.*/\1/')" -export TRAY_X="$(echo "$SCREEN_WIDTH - 550" | bc)" +export TRAY_X="$(echo "$SCREEN_WIDTH - 300" | bc)" +export TRAY_Y=4 bspc config border_width 2 bspc config window_gap 12 @@ -22,8 +23,8 @@ bspc config focus_follows_pointer true bspc monitor -d 1 2 3 4 5 6 7 8 9 -xsetroot -solid "#000" +hsetroot -solid "#000" sxhkd & -~/.config/bspwm/panel & -stalonetray -bg "#000" --geometry "1x1+$TRAY_X+2" --grow-gravity E -i $TRAY_HEIGHT & -xdotool search --classname stalonetray windowraise +#~/.config/bspwm/panel & +#stalonetray -bg "#000" --geometry "1x1+$TRAY_X+$TRAY_Y" --grow-gravity E -i $TRAY_HEIGHT & +#xdotool search --classname stalonetray windowraise diff --git a/bspwm/panel b/bspwm/panel index 4b22b0f..ca1ae02 100755 --- a/bspwm/panel +++ b/bspwm/panel @@ -42,7 +42,7 @@ bspc control --subscribe > "$PANEL_FIFO" & xtitle -sf 'T%s' > "$PANEL_FIFO" & clock -sf 'S%a %Y-%m-%d %H:%M' > "$PANEL_FIFO" & LC_TIME=en_DK.UTF-8 mpstat 1 | stdbuf -oL tail -n +4 | stdbuf -oL awk '$12 ~ /[0-9.]+/ { printf "L%3d\n", 100 - $12 }' > "$PANEL_FIFO" & -free -m -s 1 | stdbuf -oL awk '/^Mem:.*/ { printf "M%02d%%\n", ($3 - $6 - $7) / $2 * 100 }' > "$PANEL_FIFO" & +free -m -s 1 | stdbuf -oL awk '/^Mem:.*/ { printf "M%02d%%\n", $3 / $2 * 100 }' > "$PANEL_FIFO" & iostat -y -d 1 | stdbuf -oL awk '/Device.*/ { printf("\nI"); next } /^[0-9a-z]* / { printf " %s %04.0f↓ %04.0f↑", $1, $3, $4 } END { printf "\n" }' > "$PANEL_FIFO" & # Battery diff --git a/bspwm/panel_bar b/bspwm/panel_bar index 72e7629..bf0fc6d 100755 --- a/bspwm/panel_bar +++ b/bspwm/panel_bar @@ -18,24 +18,24 @@ while read -r line ; do # IO io_info="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG}${line#?}%{B-}%{F-}" ;; - B*) - # Battery - bat_info="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${line#?} %{B-}%{F-}" + B*) + # Battery + bat_info="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG}${line#?}%{B-}%{F-}" ;; - C*) - # CPU temperature + C*) + # CPU temperature temp_info="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG}${line#?}°%{B-}%{F-}" ;; - L*) - # CPU load + L*) + # CPU load load_info="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG}${line#?}%%{B-}%{F-}" ;; - M*) - # Memory usage + M*) + # Memory usage mem_info="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG}${line#?}%{B-}%{F-}" ;; - N*) - # Network throughput + N*) + # Network throughput net_info="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG}${line#?}%{B-}%{F-}" ;; W*) @@ -85,12 +85,12 @@ while read -r line ; do ;; L*) # layout - #wm_info="$wm_info %{F$COLOR_LAYOUT_FG}%{B$COLOR_LAYOUT_BG} ${name} %{B-}%{F-}" + wm_info="$wm_info%{F$COLOR_LAYOUT_FG}%{B$COLOR_LAYOUT_BG}${name}%{B-}%{F-}" ;; esac shift done ;; esac - printf "%s\n" "%{l}${wm_info} : ${load_info} ${temp_info} : ${mem_info} :${io_info} : ${net_info}%{c} ${title} %{r} ${bat_info}${sys_info}" + printf "%s\n" "%{l}${wm_info} cpu ${load_info} ${temp_info} mem ${mem_info} ${io_info} ${net_info} bat ${bat_info} %{c} ${title} %{r} ${sys_info}" done @@ -25,7 +25,7 @@ conky.config = { color6 = '#3F3B3B', default_color = '#3F3B3B', - double_buffer = false, + double_buffer = true, draw_borders = true, draw_graph_borders = true, draw_shades = false, @@ -52,7 +52,7 @@ conky.config = { --xftalpha = .2, -- choose font and size - font = 'Monospace:size=8', + font = 'Monospace:size=16', }; @@ -60,7 +60,7 @@ conky.text = [[ ${execp bspc control --get-status | cut -d ":" -f 2 | xargs ~/bin/workspaces.sh}\ \ ${color2}${alignc}CPU $color6${voffset 3}${cpugraph 20,34 859900 DC322F -t}${voffset -3}${offset 7}$color2\ -${execp echo $(cat /sys/bus/platform/devices/coretemp.0/hwmon/hwmon1/temp1_input) / 1000 | bc}°\ +${execp echo $(cat /sys/bus/platform/devices/coretemp.0/hwmon/hwmon*/temp1_input) / 1000 | bc}°\ \ Mem $color6${voffset 2}${memgraph 22,34 859900 DC322F -t}${voffset -2}${offset 7}$color2${memperc}%\ \ diff --git a/emacs.d/Drobillarized-theme.el b/emacs.d/Drobillarized-theme.el index 6482e3c..7210aef 100644 --- a/emacs.d/Drobillarized-theme.el +++ b/emacs.d/Drobillarized-theme.el @@ -1,132 +1,137 @@ (deftheme Drobillarized "Subdued theme based on Solarized palette.") -(custom-theme-set-variables - 'Drobillarized - ) +(defgroup drobillized nil + "Drobillized theme options. +Reload the theme after changing anything in this group." + :group 'faces) + +;; Background (dark) +(defcustom base03 "#002B36" "Dark base 3" :group 'drobillarized :type '(color)) +(defcustom base02 "#073642" "Dark base 2" :group 'drobillarized :type '(color)) -(let (;; Background (dark) - (base03 "#002B36") - (base02 "#073642") +;; Content +(defcustom base01 "#586E75" "Dark content 1" :group 'drobillarized :type '(color)) +(defcustom base00 "#657B83" "Dark content 0" :group 'drobillarized :type '(color)) +(defcustom base0 "#839496" "Light content 0" :group 'drobillarized :type '(color)) +(defcustom base1 "#93A1A1" "Light content 1" :group 'drobillarized :type '(color)) - ;; Content - (base01 "#586E75") - (base00 "#657B83") - (base0 "#839496") - (base1 "#93A1A1") +;; Background (light) +(defcustom base2 "#EEE8D5" "Light base 2" :group 'drobillarized :type '(color)) +(defcustom base3 "#FDF6E3" "Light base 3" :group 'drobillarized :type '(color)) - ;; Background (light) - (base2 "#EEE8D5") - (base3 "#FDF6E3") +;; Basic colors +(defcustom yellow "#B58900" "Yellow" :group 'drobillarized :type '(color)) +(defcustom orange "#CB4B16" "Orange" :group 'drobillarized :type '(color)) +(defcustom red "#DC322F" "Red" :group 'drobillarized :type '(color)) +(defcustom magenta "#D33682" "Magenta" :group 'drobillarized :type '(color)) +(defcustom violet "#6C71C4" "Violet" :group 'drobillarized :type '(color)) +(defcustom blue "#268BD2" "Blue" :group 'drobillarized :type '(color)) +(defcustom cyan "#2AA198" "Cyan" :group 'drobillarized :type '(color)) +(defcustom green "#859900" "Green" :group 'drobillarized :type '(color)) - ;; Basic colors - (yellow "#B58900") - (orange "#CB4B16") - (red "#DC322F") - (magenta "#D33682") - (violet "#6C71C4") - (blue "#268BD2") - (cyan "#2AA198") - (green "#859900") +;; Darker colors +(defcustom yellow-d "#7B6000" "Dark yellow" :group 'drobillarized :type '(color)) +(defcustom orange-d "#8B2C02" "Dark orange" :group 'drobillarized :type '(color)) +(defcustom red-d "#990A1B" "Dark red" :group 'drobillarized :type '(color)) +(defcustom magenta-d "#93115C" "Dark magenta" :group 'drobillarized :type '(color)) +(defcustom violet-d "#3F4D91" "Dark violet" :group 'drobillarized :type '(color)) +(defcustom blue-d "#00629D" "Dark blue" :group 'drobillarized :type '(color)) +(defcustom cyan-d "#00736F" "Dark cyan" :group 'drobillarized :type '(color)) +(defcustom green-d "#546E00" "Dark green" :group 'drobillarized :type '(color)) - ;; Darker colors - (yellow-d "#7B6000") - (orange-d "#8B2C02") - (red-d "#990A1B") - (magenta-d "#93115C") - (violet-d "#3F4D91") - (blue-d "#00629D") - (cyan-d "#00736F") - (green-d "#546E00") +;; Lighter colors +(defcustom yellow-l "#DEB542" "Light yellow" :group 'drobillarized :type '(color)) +(defcustom orange-l "#F2804F" "Light orange" :group 'drobillarized :type '(color)) +(defcustom red-l "#FF6E64" "Light red" :group 'drobillarized :type '(color)) +(defcustom magenta-l "#F771AC" "Light magenta" :group 'drobillarized :type '(color)) +(defcustom violet-l "#9EA0E5" "Light violet" :group 'drobillarized :type '(color)) +(defcustom blue-l "#69B7F0" "Light blue" :group 'drobillarized :type '(color)) +(defcustom cyan-l "#69CABF" "Light cyan" :group 'drobillarized :type '(color)) +(defcustom green-l "#B4C342" "Light green" :group 'drobillarized :type '(color)) - ;; Lighter colors - (yellow-l "#DEB542") - (orange-l "#F2804F") - (red-l "#FF6E64") - (magenta-l "#F771AC") - (violet-l "#9EA0E5") - (blue-l "#69B7F0") - (cyan-l "#69CABF") - (green-l "#B4C342")) +(custom-theme-set-variables + 'Drobillarized + ) - (custom-theme-set-faces - 'Drobillarized - `(default ((t (:inherit nil :stipple nil :background "#141414" :foreground "#C3D1D1" :box nil :inverse-video nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 120 :width normal :foundry "unknown" :family "DejaVu Sans Mono")))) - `(bold ((t (:weight bold)))) - `(compilation-column-number ((t (:foreground ,base00)))) - `(cursor ((t (:background ,base2)))) - `(diff-added ((t (:foreground ,green)))) - `(diff-file-header ((((class color) (min-colors 88) (background dark)) (:weight bold)))) - `(diff-header ((((class color) (min-colors 88) (background dark)) (:foreground ,violet)))) - `(diff-refine-added ((t (:inherit diff-refine-change :foreground ,green)))) - `(diff-refine-change ((t (:background ,base02)))) - `(diff-refine-removed ((t (:inherit diff-refine-change :foreground ,red)))) - `(diff-removed ((t (:foreground ,red)))) - `(dired-directory ((t (:foreground ,blue)))) - `(diredp-compressed-file-suffix ((t (:foreground ,base0)))) - `(diredp-date-time ((t (:foreground ,violet)))) - `(diredp-dir-heading ((t (:foreground ,green-l)))) - `(diredp-dir-name ((t (:foreground ,blue-d)))) - `(diredp-dir-priv ((t (:foreground ,blue-d)))) - `(diredp-exec-priv ((t (:foreground ,green)))) - `(diredp-file-name ((t (:foreground "gray90")))) - `(diredp-file-suffix ((t (:foreground "gray70")))) - `(diredp-ignored-file-name ((t (:foreground ,base0)))) - `(diredp-no-priv ((t nil))) - `(diredp-number ((t (:foreground "gray50")))) - `(diredp-rare-priv ((t (:foreground ,blue-l)))) - `(diredp-read-priv ((t (:foreground "gray70")))) - `(diredp-symlink ((t (:foreground ,cyan)))) - `(diredp-write-priv ((t (:foreground "gray90")))) - `(erc-action-face ((t (:slant italic)))) - `(erc-current-nick-face ((t (:foreground ,cyan :weight bold)))) - `(erc-input-face ((t (:foreground ,orange)))) - `(erc-my-nick-face ((t (:foreground ,orange :weight bold)))) - `(erc-nick-default-face ((t (:foreground "#A3B1B1")))) - `(erc-notice-face ((t (:foreground ,violet)))) - `(erc-timestamp-face ((t (:foreground ,green)))) - `(error ((t (:foreground ,red :weight bold)))) - `(escape-glyph ((((background dark)) (:foreground ,cyan)))) - `(font-lock-comment-face ((t (:foreground ,violet)))) - `(font-lock-constant-face ((((class color) (min-colors 88) (background dark)) (:weight bold)))) - `(font-lock-doc-face ((t (:inherit font-lock-string-face :foreground ,violet)))) - `(font-lock-function-name-face ((t (:foreground ,cyan)))) - `(font-lock-keyword-face ((t (:foreground "#839496")))) - `(font-lock-preprocessor-face ((nil (:foreground ,magenta)))) - `(font-lock-string-face ((t (:foreground ,orange)))) - `(font-lock-type-face ((t (:foreground ,green)))) - `(font-lock-variable-name-face ((t (:foreground "#E3F1F1")))) - `(font-lock-warning-face ((((class color) (min-colors 88) (background dark)) (:foreground ,red :weight bold)))) - `(fringe ((((class color) (background dark)) (:background "grey25")))) - `(header-line ((t (:inherit mode-line)))) - `(link ((((class color) (min-colors 88) (background dark)) (:foreground ,blue :inverse-video nil :underline t)))) - `(link-visited ((default (:inherit link)) (((class color) (background dark)) (:foreground ,violet)))) - `(magit-diff-added ((t (:foreground ,green)))) - `(magit-diff-added-highlight ((t (:foreground ,green)))) - `(magit-diff-context ((t (:foreground "grey70")))) - `(magit-diff-context-highlight ((t (:foreground "grey80")))) - `(magit-diff-hunk-heading ((t (:foreground ,violet)))) - `(magit-diff-hunk-heading-highlight ((t (:foreground ,violet :weight bold)))) - `(magit-diff-removed ((t (:foreground ,red)))) - `(magit-diff-removed-highlight ((t (:foreground ,red-l)))) - `(magit-section-heading ((t (:foreground ,green :weight bold)))) - `(magit-section-highlight ((t (:background "grey15")))) - `(minibuffer-prompt ((((background dark)) (:foreground "white")))) - `(mode-line ((t (:background "#2D3232" :foreground "#AFB3B2" :box (:line-width 2 :color "#1A1A1A"))))) - `(mode-line-inactive ((t (:inherit mode-line :background "#111" :foreground "#4F5352" :box (:line-width 2 :color "#141414"))))) - `(nobreak-space ((((class color) (min-colors 88)) (:inherit escape-glyph :underline t)))) - `(powerline-active1 ((t (:inherit mode-line :background "#272A2A")))) - `(powerline-active2 ((t (:inherit mode-line :background "#2D3232")))) - `(powerline-inactive2 ((t (:inherit mode-line-inactive :background "#272A2A")))) - `(region ((t (:background ,green-d)))) - `(smerge-refined-change ((t (:background "gray20")))) - `(spaceline-highlight-face ((t (:background "#272A2A" :foreground "#FFFFFF" :inherit (quote mode-line))))) - `(spaceline-modified ((t (:background "#A66" :foreground "#3E3D31" :inherit (quote mode-line))))) - `(spaceline-unmodified ((t (:background "#777" :foreground "#3E3D31" :inherit (quote mode-line))))) - `(warning ((t (:foreground ,yellow :weight bold)))) - `(whitespace-newline ((t (:foreground "grey20" :weight normal)))) - `(whitespace-space ((t (:foreground "grey20")))) - `(whitespace-tab ((t (:foreground "grey20")))) - `(erc-prompt-face ((t (:foreground ,base3 :weight bold)))))) +(custom-theme-set-faces + 'Drobillarized + `(default ((t (:inherit nil :stipple nil :background "#141414" :foreground ,drobillized-default :box nil :inverse-video nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 120 :width normal :foundry "unknown" :family "DejaVu Sans Mono")))) + `(bold ((t (:weight bold)))) + `(compilation-column-number ((t (:foreground ,base00)))) + `(cursor ((t (:background ,base2)))) + `(diff-added ((t (:foreground ,green)))) + `(diff-file-header ((((class color) (min-colors 88) (background dark)) (:weight bold)))) + `(diff-header ((((class color) (min-colors 88) (background dark)) (:foreground ,violet)))) + `(diff-refine-added ((t (:inherit diff-refine-change :foreground ,green)))) + `(diff-refine-change ((t (:background ,base02)))) + `(diff-refine-removed ((t (:inherit diff-refine-change :foreground ,red)))) + `(diff-removed ((t (:foreground ,red)))) + `(dired-directory ((t (:foreground ,blue)))) + `(diredp-compressed-file-suffix ((t (:foreground ,base0)))) + `(diredp-date-time ((t (:foreground ,violet)))) + `(diredp-dir-heading ((t (:foreground ,green-l)))) + `(diredp-dir-name ((t (:foreground ,blue-d)))) + `(diredp-dir-priv ((t (:foreground ,blue-d)))) + `(diredp-exec-priv ((t (:foreground ,green)))) + `(diredp-file-name ((t (:foreground "gray90")))) + `(diredp-file-suffix ((t (:foreground "gray70")))) + `(diredp-ignored-file-name ((t (:foreground ,base0)))) + `(diredp-no-priv ((t nil))) + `(diredp-number ((t (:foreground "gray50")))) + `(diredp-rare-priv ((t (:foreground ,blue-l)))) + `(diredp-read-priv ((t (:foreground "gray70")))) + `(diredp-symlink ((t (:foreground ,cyan)))) + `(diredp-write-priv ((t (:foreground "gray90")))) + `(erc-action-face ((t (:slant italic)))) + `(erc-current-nick-face ((t (:foreground ,cyan :weight bold)))) + `(erc-input-face ((t (:foreground ,orange)))) + `(erc-my-nick-face ((t (:foreground ,orange :weight bold)))) + `(erc-nick-default-face ((t (:foreground "#A3B1B1")))) + `(erc-notice-face ((t (:foreground ,violet)))) + `(erc-timestamp-face ((t (:foreground ,green)))) + `(error ((t (:foreground ,red :weight bold)))) + `(escape-glyph ((((background dark)) (:foreground ,cyan)))) + `(font-lock-comment-face ((t (:foreground ,violet)))) + `(font-lock-constant-face ((((class color) (min-colors 88) (background dark)) (:weight bold)))) + `(font-lock-doc-face ((t (:inherit font-lock-string-face :foreground ,violet)))) + `(font-lock-function-name-face ((t (:foreground ,cyan)))) + `(font-lock-keyword-face ((t (:foreground "#839496")))) + `(font-lock-preprocessor-face ((nil (:foreground ,magenta)))) + `(font-lock-string-face ((t (:foreground ,orange)))) + `(font-lock-type-face ((t (:foreground ,green)))) + `(font-lock-variable-name-face ((t (:foreground "#E3F1F1")))) + `(font-lock-warning-face ((((class color) (min-colors 88) (background dark)) (:foreground ,red :weight bold)))) + `(fringe ((((class color) (background dark)) (:background "grey25")))) + `(header-line ((t (:inherit mode-line)))) + `(link ((((class color) (min-colors 88) (background dark)) (:foreground ,blue :inverse-video nil :underline t)))) + `(link-visited ((default (:inherit link)) (((class color) (background dark)) (:foreground ,violet)))) + `(magit-diff-added ((t (:foreground ,green)))) + `(magit-diff-added-highlight ((t (:foreground ,green)))) + `(magit-diff-context ((t (:foreground "grey70")))) + `(magit-diff-context-highlight ((t (:foreground "grey80")))) + `(magit-diff-hunk-heading ((t (:foreground ,violet)))) + `(magit-diff-hunk-heading-highlight ((t (:foreground ,violet :weight bold)))) + `(magit-diff-removed ((t (:foreground ,red)))) + `(magit-diff-removed-highlight ((t (:foreground ,red-l)))) + `(magit-section-heading ((t (:foreground ,green :weight bold)))) + `(magit-section-highlight ((t (:background "grey15")))) + `(minibuffer-prompt ((((background dark)) (:foreground "white")))) + `(mode-line ((t (:background "#2D3232" :foreground "#AFB3B2" :box (:line-width 2 :color "#1A1A1A"))))) + `(mode-line-inactive ((t (:inherit mode-line :background "#111" :foreground "#4F5352" :box (:line-width 2 :color "#141414"))))) + `(nobreak-space ((((class color) (min-colors 88)) (:inherit escape-glyph :underline t)))) + `(powerline-active1 ((t (:inherit mode-line :background "#272A2A")))) + `(powerline-active2 ((t (:inherit mode-line :background "#2D3232")))) + `(powerline-inactive2 ((t (:inherit mode-line-inactive :background "#272A2A")))) + `(region ((t (:background ,green-d)))) + `(smerge-refined-change ((t (:background "gray20")))) + `(spaceline-highlight-face ((t (:background "#272A2A" :foreground "#FFFFFF" :inherit (quote mode-line))))) + `(spaceline-modified ((t (:background "#A66" :foreground "#3E3D31" :inherit (quote mode-line))))) + `(spaceline-unmodified ((t (:background "#777" :foreground "#3E3D31" :inherit (quote mode-line))))) + `(warning ((t (:foreground ,yellow :weight bold)))) + `(whitespace-newline ((t (:foreground "grey20" :weight normal)))) + `(whitespace-space ((t (:foreground "grey20")))) + `(whitespace-tab ((t (:foreground "grey20")))) + `(erc-prompt-face ((t (:foreground ,base3 :weight bold))))) (provide-theme 'Drobillarized) diff --git a/emacs.d/init.el b/emacs.d/init.el index 94c0b13..a23e840 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -93,6 +93,7 @@ '(auto-revert-interval 1) '(backup-by-copying t) '(backup-directory-alist (\` ((".*" \, temporary-file-directory)))) + '(browse-url-firefox-new-window-is-tab t) '(column-number-mode t) '(compilation-scroll-output t) '(cursor-in-non-selected-windows box) @@ -168,23 +169,17 @@ " " jabber-events-message " " jabber-chatstates-message))) '(jabber-roster-line-format " %c %-25n %u %-8s %S") '(jshint-mode-node-program "nodejs") + '(magit-auto-revert-mode t) '(magit-diff-refine-hunk (quote all)) '(menu-bar-mode nil) '(package-selected-packages (quote - (counsel-gtags counsel-projectile flyspell-correct-ivy ivy clang-format swift-mode projectile ggtags auctex use-package spaceline pdf-tools markdown-mode magit glsl-mode dired-rainbow dired+))) + (auctex clang-format counsel-gtags counsel-projectile dired+ dired-rainbow flyspell-correct-ivy ggtags glsl-mode ivy magit markdown-mode n3-mode pdf-tools projectile spaceline swift-mode use-package))) '(pdf-view-midnight-colors (quote ("#C3D1D1" . "#141414"))) '(powerline-default-separator nil) '(projectile-completion-system (quote ivy)) '(projectile-enable-caching t) - '(projectile-mode-line - (quote - (:eval - (if (file-remote-p default-directory) - " P[R]" - (format " P[%s]" - (projectile-project-name)))))) - '(projectile-use-git-grep t) + '(projectile-mode-line nil) '(quack-pretty-lambda-p t) '(quack-run-scheme-always-prompts-p nil) '(savehist-mode t) @@ -203,7 +198,7 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(default ((t (:inherit nil :stipple nil :background "#141414" :foreground "#C3D1D1" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 120 :width normal :foundry "unknown" :family "DejaVu Sans Mono")))) + '(default ((t (:inherit nil :stipple nil :background "#141414" :foreground "#C3D1D1" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 90 :width normal :foundry "unknown" :family "DejaVu Sans Mono")))) '(bold ((t (:weight bold)))) '(compilation-column-number ((t (:foreground "grey40")))) '(cursor ((t (:background "grey80")))) @@ -246,6 +241,7 @@ '(font-latex-italic-face ((t (:inherit italic :foreground "#859900")))) '(font-latex-math-face ((t (:foreground "#DC322F")))) '(font-latex-sectioning-5-face ((t (:inherit nil :foreground "#B58900" :weight bold)))) + '(font-latex-sedate-face ((t (:foreground "#2aa198")))) '(font-latex-string-face ((t (:foreground "#F2804F")))) '(font-latex-warning-face ((t (:inherit bold :foreground "#FF6E64")))) '(font-lock-comment-face ((t (:foreground "#6c71c4")))) @@ -368,6 +364,7 @@ (global-set-key (kbd "C-c <") 'first-error) (global-set-key (kbd "C-c =") 'set-variable) +(global-set-key (kbd "C-c I") 'clang-format-region) (global-set-key (kbd "C-c R") 'replace-regexp) (global-set-key (kbd "C-c a") 'align) (global-set-key (kbd "C-c c") 'comment-region) diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc index e6b5de3..f9b005b 100644 --- a/sxhkd/sxhkdrc +++ b/sxhkd/sxhkdrc @@ -7,12 +7,14 @@ super + p xdotool search --classname Conky windowmap; \ xdotool search --name bar windowmap; \ xdotool search --classname stalonetray windowmap; \ - xdotool search --classname stalonetray windowraise + xdotool search --classname stalonetray windowraise; \ + xdotool search --name "Top Expanded Edge Panel" windowmap; super + shift + p xdotool search --classname stalonetray windowunmap; \ xdotool search --classname Conky windowunmap; \ xdotool search --name bar windowunmap; \ + xdotool search --name "Top Expanded Edge Panel" windowunmap; \ bspc config top_padding 0 super + s @@ -75,6 +77,9 @@ super + y super + m bspc window -s biggest +super + space + bspc desktop -l next + super + {_,shift + }{Left,Down,Up,Right} bspc window -{f,s} {left,down,up,right} @@ -121,11 +126,8 @@ super + @button{1-3} super + Return gnome-terminal -super + space - dmenu_run -sb "#92A850" -fn monospace-13 - super + ctrl + r - dmenu_run -sb "#92A850" -fn monospace-13 + rofi -fg "#92A850" -font "Monospace 20" -show run # make sxhkd reload its configuration files: super + Escape @@ -136,10 +138,10 @@ super + Escape # XF86MonBrightnessDown - xbacklight -dec 15 + xbacklight -dec 2 XF86MonBrightnessUp - xbacklight -inc 15 + xbacklight -inc 2 XF86KbdBrightnessDown /home/drobilla/bin/kbdled.sh down |