added XDG configs in `xdg/' and env exports in `.zshenv'.
files are in `xdg/' for XDG-style configs (eg. files in `.config') and
in `base/' for legacy dotfile-style configs (eg. `.zshrc').
install.sh was modified to support this.
volume keys in i3 were fixed.
vim tw removed by default.
--- /dev/null
+xdg/tint2/tint2rc.backup.*
+
+# vim
+base/.vim/.netrwhist
+*.swp
packadd matchit
set backup
-set backupdir=$HOME/tmp//
+set backupdir=$HOME/tmp/vim//
set undofile
-set undodir=$HOME/tmp//
+set undodir=$HOME/tmp/vim//
set autoindent
-set textwidth=79
set colorcolumn=80
autocmd FileType python setlocal tabstop=4 shiftwidth=4 expandtab
autocmd FileType markdown setlocal tabstop=4 shiftwidth=4 expandtab
set listchars=tab:├─,extends:»,precedes:«,space:·,trail:∙,nbsp:■
set number
set relativenumber
-autocmd FocusLost * :set norelativenumber
-autocmd FocusGained * :set relativenumber
autocmd InsertEnter * :set norelativenumber
autocmd InsertLeave * :set relativenumber
+autocmd FocusLost * :set norelativenumber
+autocmd FocusGained * :set relativenumber
export EDITOR=vim
-export XDG_CACHE_HOME="$HOME/tmp/"
+export XDG_DATA_HOME="$HOME/share"
+export XDG_DATA_DIRS="$HOME/.local/share:/usr/local/share/:/usr/share/"
+export XDG_CACHE_HOME="$HOME/tmp"
export CLICOLOR=
export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
zstyle ':vcs_info:*' enable git
zstyle ':vcs_info:*' get-revision true
zstyle ':vcs_info:git*' formats "(%F{green}%r/%b%f) %m%u%c "
-precmd() { vcs_info }
+
+function precmd {
+ vcs_info
+ print -Pn "\e]0;%#zsh%L %(1j,%jj ,)%~\a"
+}
+function preexec {
+ printf "\033]0;%s\a" "$1"
+}
# prompt
setopt prompt_subst
alias lf="ls -AF"
alias ll="ls -lhAF"
alias pa="sudo ps -Sudax"
+function s { sysctl hw.snd.default_unit=$1 }
# be paranoid
alias cp='cp -ip'
alias activate="source bin/activate"
# ports
-alias pkg-install-make-build-depends="sudo pkg install --automatic \`make build-depends-list | sed 's/\/usr\/ports\// /' | tr -d '\n'\`"
-alias pkg-install-make-run-depends="sudo pkg install --automatic \`make run-depends-list | sed 's/\/usr\/ports\// /' | tr -d '\n'\`"
+alias pbuild="sudo pkg install --automatic \`make build-depends-list | sed 's/\/usr\/ports\// /' | tr -d '\n'\`"
+alias prun="sudo pkg install --automatic \`make run-depends-list | sed 's/\/usr\/ports\// /' | tr -d '\n'\`"
# keys
bindkey "^[[7~" beginning-of-line #Home
bindkey -v
# End of lines configured by zsh-newuser-install
-# vim: ts=8:sts=4:sw=4:et:tw=80
+# vim: ts=8:sts=4:sw=4:et:tw=79
#!/bin/sh
-for x in `find "$PWD" -mindepth 1 -maxdepth 1 \! \( -name '.git' -name 'install.sh' \) -name '.*'`; do
+
+#fix permissions from git (should probably move this to git hook)
+chmod go= base/.zshenv base/.Xresources
+
+for x in `find "$PWD/base" -mindepth 1 -maxdepth 1`; do
ln -vwis "$x" "$HOME/`basename $x`"
done
-ln -vwis "$PWD/i3-config" "$HOME/.config/i3/config"
-ln -vwis "$PWD/i3status-config" "$HOME/.config/i3status/config"
touch "$HOME/.hushlogin"
-#fix permissions from git (should probably move this to git hook)
-chmod go= .zshenv .Xresources
-#
#FreeBSD tries `_secure_path' on `.login_conf' before reaading the database,
#so it needs to be compiled and unlinked for it to actually take effect.
+cd "$HOME"
rm .login_conf.db
cap_mkdb .login_conf
unlink .login_conf
+cd -
--- /dev/null
+# Shadow
+shadow = true;
+no-dnd-shadow = true;
+no-dock-shadow = true;
+clear-shadow = true;
+shadow-radius = 7;
+shadow-offset-x = -7;
+shadow-offset-y = -7;
+shadow-opacity = 1;
+shadow-exclude = [
+ "_GTK_FRAME_EXTENTS@:c",
+ # fullscreen
+ "x = 0 && y = 0 && override_redirect = true"
+];
+shadow-ignore-shaped = true;
+xinerama-shadow-crop = true;
+
+# Opacity
+menu-opacity = 0.9;
+inactive-opacity = 0.875;
+active-opacity = 1;
+alpha-step = 0.01;
+inactive-dim = 0.075;
+blur-background = true;
+blur-kern = "5,5,0.367879,0.535261,0.606531,0.535261,0.367879,0.535261,0.778801,0.882497,0.778801,0.535261,0.606531,0.882497,0.882497,0.606531,0.535261,0.778801,0.882497,0.778801,0.535261,0.367879,0.535261,0.606531,0.535261,0.367879,"
+
+# Fading
+fading = true;
+fade-delta = 16;
+fade-in-step = 0.05;
+fade-out-step = 0.05;
+
+# Rendering
+backend = "glx"
+glx-no-stencil = true;
+glx-no-rebind-pixmap = true;
+paint-on-overlay = true;
+refresh-rate = 0;
+vsync = "opengl-swc";
+
+# Other
+mark-wmwin-focused = true;
+mark-ovredir-focused = true;
+use-ewmh-active-win = true;
+detect-rounded-corners = true;
+detect-client-opacity = true;
+detect-transient = true;
+detect-client-leader = true;
+
+# Window type settings
+wintypes:
+{
+ tooltip = { fade = true; shadow = true; opacity = 0.9; focus = true; };
+};
--- /dev/null
+[global]
+geometry = "400x0-30-30"
+follow = keyboard
+sort = yes
+
+font = "Dina, DejaVu Sans Mono, monospace 9"
+markup = no
+format = "<b>%s</b> %p <span size='5120' color='#586e75'>%a</span>\n%b"
+show_age_threshold = 5
+
+frame_width = 1
+separator_height = 1
+separator_color = frame
+padding = 4
+horizontal_padding = 4
+icon_position = left
+icon_folders = "/home/ds6/.icons/Paper/16x16/status/:/home/ds6/.icons/Paper/16x16/devices/:/home/ds6/.icons/Paper/16x16/emblems/:/usr/local/share/icons/Adwaita/16x16/status/:/usr/local/share/icons/Adwaita/16x16/devices/:/usr/local/share/icons/Adwaita/16x16/emblems/"
+
+dmenu = "/home/ds6/bin/dmenu -p dunst:"
+browser = /usr/local/bin/luakit
+
+[shortcuts]
+#close = mod4+mod1+q
+#close_all = mod4+mod1+shift+q
+history = mod4+grave
+context = mod4+shift+grave
+
+[urgency_low]
+background = "#110800"
+foreground = "#93a1a1"
+frame_color = "#884400"
+timeout = 5
+
+[urgency_normal]
+background = "#221100"
+foreground = "#eee8d5"
+frame_color = "#268bd2"
+timeout = 10
+
+[urgency_critical]
+background = "#dc332f"
+foreground = "#000000"
+frame_color = "#ff4400"
+timeout = 0
+
+# vim: ft=cfg
--- /dev/null
+[Settings]
+gtk-theme-name=Blackbird
+gtk-icon-theme-name=Paper-Mono-Dark
+gtk-font-name=Dina 10
+gtk-cursor-theme-name=Adwaita
bindcode 204 exec --no-startup-id rotate right
# volume buttons
-bindsym XF86AudioMute exec -no-startup-id mixer vol 0
-bindsym XF86AudioRaiseVolume exec -no-startup-id mixer vol +5
-bindsym XF86AudioLowerVolume exec -no-startup-id mixer vol -5
+bindsym XF86AudioMute exec --no-startup-id mixer vol 0
+bindsym XF86AudioLowerVolume exec --no-startup-id mixer vol -5
+bindsym XF86AudioRaiseVolume exec --no-startup-id mixer vol +5
# move and resize [floating] windows
mode "translate" {
new_window pixel 1
gaps inner 6
smart_gaps on
-#for_window [class="^URxvt$"] border pixel 1
-#for_window [class="^links$"] border pixel 1
# misc
workspace_auto_back_and_forth yes
--- /dev/null
+------------------------------------------------------------------------------
+-- luakit configuration file, more information at https://luakit.github.io/ --
+------------------------------------------------------------------------------
+
+require "lfs"
+
+require "unique_instance"
+
+-- Set the number of web processes to use. A value of 0 means 'no limit'.
+luakit.process_limit = 4
+-- Set the cookie storage location
+soup.cookies_storage = luakit.data_dir .. "/cookies.db"
+
+-- Load library of useful functions for luakit
+local lousy = require "lousy"
+
+-- Load users theme
+-- ("$XDG_CONFIG_HOME/luakit/theme.lua" or "/etc/xdg/luakit/theme.lua")
+lousy.theme.init(lousy.util.find_config("theme.lua"))
+assert(lousy.theme.get(), "failed to load theme")
+
+-- Load users window class
+-- ("$XDG_CONFIG_HOME/luakit/window.lua" or "/etc/xdg/luakit/window.lua")
+local window = require "window"
+
+-- Load users webview class
+-- ("$XDG_CONFIG_HOME/luakit/webview.lua" or "/etc/xdg/luakit/webview.lua")
+local webview = require "webview"
+
+-- Add luakit;//log/ chrome page
+local log_chrome = require "log_chrome"
+
+window.add_signal("build", function (w)
+ local widgets, l, r = require "lousy.widget", w.sbar.l, w.sbar.r
+
+ -- Left-aligned status bar widgets
+ l.layout:pack(widgets.uri())
+ l.layout:pack(widgets.hist())
+ l.layout:pack(widgets.progress())
+
+ -- Right-aligned status bar widgets
+ r.layout:pack(widgets.buf())
+ r.layout:pack(log_chrome.widget())
+ r.layout:pack(widgets.ssl())
+ r.layout:pack(widgets.tabi())
+ r.layout:pack(widgets.scroll())
+end)
+
+-- Load luakit binds and modes
+local modes = require "modes"
+local binds = require "binds"
+
+local settings = require "settings"
+require "settings_chrome"
+
+----------------------------------
+-- Optional user script loading --
+----------------------------------
+
+-- Add adblock
+local adblock = require "adblock"
+local adblock_chrome = require "adblock_chrome"
+
+local webinspector = require "webinspector"
+
+-- Add uzbl-like form filling
+local formfiller = require "formfiller"
+
+-- Add proxy support & manager
+local proxy = require "proxy"
+
+-- Add quickmarks support & manager
+local quickmarks = require "quickmarks"
+
+-- Add session saving/loading support
+local session = require "session"
+
+-- Add command to list closed tabs & bind to open closed tabs
+local undoclose = require "undoclose"
+
+-- Add command to list tab history items
+local tabhistory = require "tabhistory"
+
+-- Add greasemonkey-like javascript userscript support
+local userscripts = require "userscripts"
+
+-- Add bookmarks support
+local bookmarks = require "bookmarks"
+local bookmarks_chrome = require "bookmarks_chrome"
+
+-- Add download support
+local downloads = require "downloads"
+local downloads_chrome = require "downloads_chrome"
+
+-- Add automatic PDF downloading and opening
+local viewpdf = require "viewpdf"
+
+-- Example using xdg-open for opening downloads / showing download folders
+downloads.add_signal("open-file", function (file)
+ luakit.spawn(string.format("xdg-open %q", file))
+ return true
+end)
+
+-- Add vimperator-like link hinting & following
+local follow = require "follow"
+
+-- Add command history
+local cmdhist = require "cmdhist"
+
+-- Add search mode & binds
+local search = require "search"
+
+-- Add ordering of new tabs
+local taborder = require "taborder"
+
+-- Save web history
+local history = require "history"
+local history_chrome = require "history_chrome"
+
+local help_chrome = require "help_chrome"
+local binds_chrome = require "binds_chrome"
+
+-- Add command completion
+local completion = require "completion"
+
+-- Press Control-E while in insert mode to edit the contents of the currently
+-- focused <textarea> or <input> element, using `xdg-open`
+local open_editor = require "open_editor"
+
+-- NoScript plugin, toggle scripts and or plugins on a per-domain basis.
+-- `,ts` to toggle scripts, `,tp` to toggle plugins, `,tr` to reset.
+-- If you use this module, don't use any site-specific `enable_scripts` or
+-- `enable_plugins` settings, as these will conflict.
+require "noscript"
+
+local follow_selected = require "follow_selected"
+local go_input = require "go_input"
+local go_next_prev = require "go_next_prev"
+local go_up = require "go_up"
+
+-- Filter Referer HTTP header if page domain does not match Referer domain
+require_web_module("referer_control_wm")
+
+local error_page = require "error_page"
+
+-- Add userstyles loader
+local styles = require "styles"
+
+-- Hide scrollbars on all pages
+local hide_scrollbars = require "hide_scrollbars"
+
+-- Add a stylesheet when showing images
+local image_css = require "image_css"
+
+-- Add a new tab page
+local newtab_chrome = require "newtab_chrome"
+
+-- Add tab favicons mod
+local tab_favicons = require "tab_favicons"
+
+-- Add :view-source command
+local view_source = require "view_source"
+
+-----------------------------
+-- End user script loading --
+-----------------------------
+
+settings.window.search_engines = {
+ ddg = "https://duckduckgo.com/?q=%s",
+ gh = "https://github.com/search?q=%s",
+ w = "https://en.wikipedia.org/wiki/Special:Search?search=%s"
+}
+settings.window.search_engines.default = settings.window.search_engines.ddg
+
+
+-- Restore last saved session
+local w = (not luakit.nounique) and (session and session.restore())
+if w then
+ for i, uri in ipairs(uris) do
+ w:new_tab(uri, { switch = i == 1 })
+ end
+else
+ -- Or open new window
+ window.new(uris)
+end
+
+-- vim: et:sw=4:ts=8:sts=4:tw=80
--- /dev/null
+----------------------------
+-- Solarized luakit theme --
+----------------------------
+
+--local S_base03 = "#002b36"
+local S_base03 = "#000a0d"
+local S_base02 = "#073642"
+local S_base01 = "#586e75"
+local S_base00 = "#657b83"
+local S_base0 = "#839496"
+local S_base1 = "#93a1a1"
+local S_base2 = "#eee8d5"
+local S_base3 = "#fdf6e3"
+
+local S_yellow = "#b58900"
+local S_orange = "#cb4b16"
+local S_red = "#dc322f"
+local S_magenta = "#d33682"
+local S_violet = "#6c71c4"
+local S_blue = "#268bd2"
+local S_cyan = "#2aa198"
+--local S_green = "#859900"
+local S_green = "#85c000"
+
+
+local theme = {}
+
+-- Default settings
+theme.font = "10px Dina"
+theme.fg = S_base0
+theme.bg = S_base03
+
+-- General colour pairings
+theme.ok = { fg = S_base0, bg = S_base03 }
+theme.warn = { fg = S_yellow, bg = S_base02 }
+theme.error = { fg = "#000", bg = S_red }
+
+-- General colours
+theme.success_fg = S_green
+theme.loaded_fg = S_cyan
+theme.warning_fg = theme.warn.fg
+theme.warning_bg = theme.warn.bg
+theme.error_fg = theme.error.fg
+theme.error_bg = theme.error.bg
+
+-- Notification colours
+theme.notif_fg = S_blue
+theme.notif_bg = S_base02
+
+-- Menu colours
+theme.menu_fg = S_base0
+theme.menu_bg = S_base03
+theme.menu_selected_fg = S_base0
+theme.menu_selected_bg = S_base02
+theme.menu_title_bg = S_base03
+theme.menu_primary_title_fg = S_base0
+theme.menu_secondary_title_fg = S_base01
+
+theme.menu_disabled_fg = S_base01
+theme.menu_disabled_bg = S_base03
+theme.menu_enabled_fg = S_yellow --?
+theme.menu_enabled_bg = S_green --?
+theme.menu_active_fg = S_green
+theme.menu_active_bg = theme.menu_bg
+
+-- Proxy manager
+theme.proxy_active_menu_fg = S_green
+theme.proxy_active_menu_bg = theme.menu_bg
+theme.proxy_inactive_menu_fg = theme.menu_fg
+theme.proxy_inactive_menu_bg = theme.menu_bg
+
+-- Statusbar specific
+theme.sbar_fg = S_base0
+theme.sbar_bg = "#110800"
+
+-- Downloadbar specific
+theme.dbar_fg = theme.menu_fg
+theme.dbar_bg = theme.menu_bg
+theme.dbar_error_fg = S_red
+
+-- Input bar specific
+theme.ibar_fg = S_base1
+theme.ibar_bg = S_base03
+
+-- Tab label
+theme.tab_fg = S_base0
+theme.tab_bg = S_base03
+theme.tab_hover_bg = S_base02
+theme.tab_ntheme = S_red
+theme.selected_fg = S_base1
+theme.selected_bg = S_base02
+theme.selected_ntheme = S_magenta
+theme.loading_fg = S_green
+theme.loading_bg = S_base02
+
+theme.selected_private_tab_bg = S_violet
+theme.private_tab_bg = S_magenta
+
+-- Trusted/untrusted ssl colours
+theme.trust_fg = S_green
+theme.notrust_fg = S_base01
+
+
+return theme
+
+-- vim: et:sw=4:ts=8:sts=4:tw=80
--- /dev/null
+#---- Generated by tint2conf 758d ----
+# See https://gitlab.com/o9000/tint2/wikis/Configure for
+# full documentation of the configuration options.
+#-------------------------------------
+# Gradients
+#-------------------------------------
+# Backgrounds
+# Background 1: Inactive desktop name, Tooltip
+rounded = 0
+border_width = 1
+border_sides = TBLR
+background_color = #221100 100
+border_color = #884400 100
+background_color_hover = #000000 0
+border_color_hover = #000000 0
+background_color_pressed = #000000 0
+border_color_pressed = #000000 0
+
+# Background 2: Urgent task
+rounded = 0
+border_width = 1
+border_sides = TBLR
+background_color = #dc322f 100
+border_color = #ff4444 100
+background_color_hover = #000000 0
+border_color_hover = #000000 0
+background_color_pressed = #000000 0
+border_color_pressed = #000000 0
+
+# Background 3: Panel
+rounded = 0
+border_width = 0
+border_sides =
+background_color = #110800 100
+border_color = #000000 0
+background_color_hover = #000000 0
+border_color_hover = #000000 0
+background_color_pressed = #000000 0
+border_color_pressed = #000000 0
+
+# Background 4: Active desktop name, Active task
+rounded = 0
+border_width = 1
+border_sides = TBLR
+background_color = #aa5500 100
+border_color = #cc6600 100
+background_color_hover = #000000 0
+border_color_hover = #000000 0
+background_color_pressed = #000000 0
+border_color_pressed = #000000 0
+
+#-------------------------------------
+# Panel
+panel_items = T:C
+panel_size = 100% 19
+panel_margin = 0 0
+panel_padding = 0 1 0
+panel_background_id = 3
+wm_menu = 1
+panel_dock = 1
+panel_position = top center horizontal
+panel_layer = top
+panel_monitor = all
+primary_monitor_first = 0
+panel_shrink = 0
+autohide = 0
+autohide_show_timeout = 0
+autohide_hide_timeout = 0.5
+autohide_height = 1
+strut_policy = minimum
+panel_window_name = tint2
+disable_transparency = 1
+mouse_effects = 0
+font_shadow = 0
+mouse_hover_icon_asb = 100 0 0
+mouse_pressed_icon_asb = 100 0 0
+
+#-------------------------------------
+# Taskbar
+taskbar_mode = multi_desktop
+taskbar_hide_if_empty = 0
+taskbar_padding = 0 0 1
+taskbar_background_id = 0
+taskbar_active_background_id = 0
+taskbar_name = 1
+taskbar_hide_inactive_tasks = 0
+taskbar_hide_different_monitor = 0
+taskbar_always_show_all_desktop_tasks = 0
+taskbar_name_padding = 4 0
+taskbar_name_background_id = 1
+taskbar_name_active_background_id = 4
+taskbar_name_font = Dina 8
+taskbar_name_font_color = #93a1a1 100
+taskbar_name_active_font_color = #eee8d5 100
+taskbar_distribute_size = 1
+taskbar_sort_order = none
+task_align = left
+
+#-------------------------------------
+# Task
+task_text = 1
+task_icon = 1
+task_centered = 0
+urgent_nb_of_blink = 10
+task_maximum_size = 150 0
+task_padding = 1 0 2
+task_font = Dina 8
+task_tooltip = 1
+task_font_color = #93a1a1 100
+task_active_font_color = #eee8d5 100
+task_urgent_font_color = #000000 100
+task_icon_asb = 80 -20 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 25 -100 0
+task_active_background_id = 4
+task_urgent_background_id = 2
+mouse_left = toggle
+mouse_middle = close
+mouse_right = toggle
+mouse_scroll_up = next_task
+mouse_scroll_down = prev_task
+
+#-------------------------------------
+# System tray (notification area)
+systray_padding = 0 0 1
+systray_background_id = 0
+systray_sort = ascending
+systray_icon_size = 0
+systray_icon_asb = 100 0 0
+systray_monitor = 1
+systray_name_filter =
+
+#-------------------------------------
+# Launcher
+launcher_padding = 0 0 1
+launcher_background_id = 0
+launcher_icon_background_id = 0
+launcher_icon_size = 0
+launcher_icon_asb = 100 0 0
+launcher_icon_theme = Paper-Mono-Dark
+launcher_icon_theme_override = 0
+startup_notifications = 1
+launcher_tooltip = 1
+
+#-------------------------------------
+# Clock
+time1_format = %a/%b %d/%m/%Y %H:%M:%S
+time2_format =
+time1_font = Dina 8
+time1_timezone =
+time2_timezone =
+clock_font_color = #93a1a1 100
+clock_padding = 0 0
+clock_background_id = 0
+clock_tooltip =
+clock_tooltip_timezone =
+clock_lclick_command =
+clock_rclick_command =
+clock_mclick_command =
+clock_uwheel_command =
+clock_dwheel_command =
+
+#-------------------------------------
+# Battery
+battery_tooltip = 0
+battery_low_status = 0
+battery_low_cmd =
+battery_font_color = #ffffff 100
+battery_padding = 0 0
+battery_background_id = 0
+battery_hide = 101
+battery_lclick_command =
+battery_rclick_command =
+battery_mclick_command =
+battery_uwheel_command =
+battery_dwheel_command =
+ac_connected_cmd =
+ac_disconnected_cmd =
+
+#-------------------------------------
+# Separator 1
+separator = new
+separator_background_id = 0
+separator_color = #000000 0
+separator_style = empty
+separator_size = 15
+separator_padding = 0 0
+
+#-------------------------------------
+# Tooltip
+tooltip_show_timeout = 0
+tooltip_hide_timeout = 0
+tooltip_padding = 2 0
+tooltip_background_id = 1
+tooltip_font_color = #eee8d5 100
+tooltip_font = Dina 10
+
projects / sev's projects / dotfiles.git / commitdiff