', 'open -t about:blank')
c.url.searchengines = {
'DEFAULT': 'https://www.google.com/search?q={}',
'ddg': 'https://duckduckgo.com/?q={}',
@@ -60,9 +60,9 @@ c.colors.downloads.bar.bg = color01
c.colors.downloads.error.bg = color06
c.colors.downloads.start.bg = color03
c.colors.downloads.stop.bg = color04
-#c.colors.messages.info.bg = color01
-#c.colors.messages.info.border = color01
-#c.colors.messages.warning.border = color01
+c.colors.messages.info.bg = color01
+c.colors.messages.info.border = color01
+c.colors.messages.warning.border = color01
c.colors.statusbar.caret.bg = color01
c.colors.statusbar.command.bg = color01
c.colors.statusbar.insert.bg = color01
diff --git a/config/qutebrowser/quickmarks b/config/qutebrowser/quickmarks
index 85197ec..4962ee2 100644
--- a/config/qutebrowser/quickmarks
+++ b/config/qutebrowser/quickmarks
@@ -8,6 +8,4 @@ Notabug https://notabug.org
Dropbox https://dropbox.com
MEGA https://mega.nz
MediaFire https://mediafire.com
-Pingvinus https://pingvinus.ru/
-Reddit https://www.reddit.com/
-Figma https://www.figma.com/files/recent
+Reddit https://reddit.com
diff --git a/config/ranger/plugins/archive.py b/config/ranger/plugins/archive.py
index fa8affa..7ef41bf 100644
--- a/config/ranger/plugins/archive.py
+++ b/config/ranger/plugins/archive.py
@@ -96,3 +96,5 @@ class extract_to_dirs(Command):
obj = CommandLoader(args=['aunpack'] + make_flags(f.path) + [f.path], descr=descr, read=True)
obj.signal_bind('after', refresh)
self.fm.loader.add(obj)
+
+
diff --git a/config/ranger/plugins/git.py b/config/ranger/plugins/git.py
index 0ac5cb8..80589e0 100644
--- a/config/ranger/plugins/git.py
+++ b/config/ranger/plugins/git.py
@@ -3,19 +3,25 @@ from ranger.api.commands import Command
class git(Command):
+
commands = 'init status clone add rm restore commit remote push'.split()
+
def execute(self):
+ # empty
if not self.arg(1):
return self.fm.notify("For commands check \"git help\"")
+ # help
if self.arg(1) == "help":
return self.fm.notify("Not done yet!", bad=True)
+ # init
if self.arg(1) == self.commands[0]:
subprocess.run(["git", "init", "--quiet"])
return self.fm.notify("Repository initialized successefully")
+ # status
if self.arg(1) == self.commands[1]:
output = subprocess.check_output(["git", "status"]).decode()
@@ -24,6 +30,7 @@ class git(Command):
return self.fm.edit_file('/tmp/gitplug-status')
+ # clone
if self.arg(1) == self.commands[2]:
if not self.arg(2):
return self.fm.notify("Missing url!", bad=True)
@@ -32,6 +39,7 @@ class git(Command):
subprocess.run(["git", "clone", self.arg(2), "--quiet"])
return self.fm.notify("Repository successfully cloned!")
+ # add
if self.arg(1) == self.commands[3]:
if not self.arg(2):
return self.fm.notify("Missing arguments! Usage :git add ", bad=True)
@@ -40,6 +48,7 @@ class git(Command):
subprocess.run(["git", "add", self.arg(2)])
return self.fm.notify("Successfully added files to branch!")
+ #rm
if self.arg(1) == self.commands[4]:
if not self.arg(2):
return self.fm.notify("Missing arguments! Usage :git rm ", bad=True)
@@ -48,6 +57,7 @@ class git(Command):
subprocess.run(["git", "rm", self.arg(2)])
return self.fm.notify("Successfully removed files from branch!")
+ # restore
if self.arg(1) == self.commands[5]:
if not self.arg(2):
return self.fm.notify("Missing arguments! Usage :git restore ", bad=True)
@@ -56,6 +66,7 @@ class git(Command):
subprocess.run(["git", "restore", "--staged", self.arg(2), "--quiet"])
return self.fm.notify("Successfully restored files!")
+ # commit
if self.arg(1) == self.commands[6]:
if not self.rest(2):
return self.fm.notify("Missing commit text", bad=True)
@@ -64,6 +75,7 @@ class git(Command):
subprocess.run(["git", "commit", "-m", self.rest(2), "--quiet"])
return self.fm.notify("Successfully commited!")
+ # remote
if self.arg(1) == self.commands[7]:
if not self.arg(2):
return self.fm.notify("Missing arguments! Use: git remote add/rm ", bad=True)
@@ -88,6 +100,7 @@ class git(Command):
subprocess.run(["git", "remote", "rm", self.arg(3)])
return self.fm.notify("Remote successfully removed")
+ # push
if self.arg(1) == self.commands[8]:
if self.arg(2) == "-u" and self.arg(3) and self.arg(4):
subprocess.run(["git", "push", "--quiet", "-u", self.arg(3), self.arg(4)])
diff --git a/config/ranger/rc.conf b/config/ranger/rc.conf
index a5585f6..c3863df 100644
--- a/config/ranger/rc.conf
+++ b/config/ranger/rc.conf
@@ -1,6 +1,6 @@
############
### Options
-###########
+############
### Appearance
set colorscheme solarized
@@ -24,36 +24,25 @@ set vcs_msg_length 30
### Preview
set preview_images true
-#set preview_images_method w3m
-set preview_images_method kitty
-
+set preview_images_method w3m
set w3m_delay 0.02
set w3m_offset 0
-set iterm2_font_width 8
-set iterm2_font_height 11
-
set unicode_ellipsis false
set bidi_support false
set show_hidden_bookmarks true
-
set preview_files true
set preview_directories true
set collapse_preview true
-
set wrap_plaintext_previews false
set draw_progress_bar_in_status_bar true
set draw_borders none
-
set dirname_in_tabs false
-
set mouse_enabled true
-
set display_size_in_main_column true
set display_size_in_status_bar true
set display_free_space_in_status_bar false
set display_tags_in_all_columns true
-
set update_title false
set update_tmux_title false
set shorten_title 3
@@ -64,47 +53,31 @@ set tilde_in_titlebar trues
set max_history_size 20
set max_console_history_size 50
set save_console_history false
-
-
set scroll_offset 4
set flushinput true
set padding_right true
-
set autosave_bookmarks true
set save_backtick_bookmark true
-
set autoupdate_cumulative_size false
set show_cursor false
-
-# One of: size, natural, basename, atime, ctime, mtime, type, random
set sort natural
-
set sort_reverse false
set sort_case_insensitive true
set sort_directories_first true
set sort_unicode false
-
set xterm_alt_key false
-
set cd_bookmarks true
set cd_tab_case sensitive
set cd_tab_fuzzy false
-
set preview_max_size 0
-
set hint_collapse_threshold 10
-
set show_selection_in_titlebar true
set idle_delay 2000
-
set metadata_deep_search false
set clear_filters_on_dir_change false
-
-# Possible values: false, absolute, relative.
set line_numbers false
set relative_current_zero false
set one_indexed false
-
set save_tabs_on_exit false
set wrap_scroll false
set global_inode_type_filter
@@ -115,6 +88,14 @@ set nested_ranger_warning true
#################################
# Command Aliases in the Console
#################################
+
+# "a" key
+map a rename_append
+map a
+map A eval fm.open_console('rename ' + fm.thisfile.relative_path.replace("%", "%%"))
+
+
+
map ex extract
map ed extract_to_dirs
map ec compress
@@ -227,8 +208,6 @@ map gd cd ~/code
map E edit
map cw console rename%space
-map a rename_append
-map A eval fm.open_console('rename ' + fm.thisfile.relative_path.replace("%", "%%"))
map I eval fm.open_console('rename ' + fm.thisfile.relative_path.replace("%", "%%"), position=7)
map pp paste
diff --git a/config/ranger/rifle.conf b/config/ranger/rifle.conf
index ceac109..9d2dfeb 100644
--- a/config/ranger/rifle.conf
+++ b/config/ranger/rifle.conf
@@ -1,6 +1,7 @@
#############
### Websites
#############
+ext x?html?, has qutebrowser, X, flag f = qutebrowser -- "$@"
ext x?html?, has firefox, X, flag f = firefox -- "$@"
ext x?html?, has chromium-browser, X, flag f = chromium-browser -- "$@"
ext x?html?, has chromium, X, flag f = chromium -- "$@"
@@ -8,7 +9,6 @@ ext x?html?, has google-chrome, X, flag f = google-chrome -- "$@"
ext x?html?, has surf, X, flag f = surf -- file://"$1"
ext x?html?, has vimprobable, X, flag f = vimprobable -- "$@"
ext x?html?, has vimprobable2, X, flag f = vimprobable2 -- "$@"
-ext x?html?, has qutebrowser, X, flag f = qutebrowser -- "$@"
ext x?html?, has dwb, X, flag f = dwb -- "$@"
ext x?html?, has jumanji, X, flag f = jumanji -- "$@"
ext x?html?, has luakit, X, flag f = luakit -- "$@"
@@ -126,7 +126,7 @@ ext cbz, has zathura, X, flag f = zathura -- "$@"
mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@"
mime ^image/svg, has display, X, flag f = display -- "$@"
-mime ^image, has pix X, flag f = pix "$@"
+mime ^image, has pix X, flag f = pix -- "$@"
mime ^image, has ristretto, X, flag f = ristretto "$@"
mime ^image, has gpicview, X, flag f = gpicview -- "$@"
mime ^image, has gwenview, X, flag f = gwenview -- "$@"
diff --git a/config/rofi/flat-solarized.rasi b/config/rofi/flat-solarized.rasi
deleted file mode 100644
index 8dc1cb3..0000000
--- a/config/rofi/flat-solarized.rasi
+++ /dev/null
@@ -1,42 +0,0 @@
-* {
- background-color: #002b36;
- border-color: #606060;
- text-color: #c8c8c8;
- width: 768px;
- height: 512px;
-}
-
-window {
- padding: 8px;
-}
-
-inputbar {
- padding: 8px;
- children: [/* prompt, */ entry];
-}
-
-prompt {
- border: 0 1px 0 0;
- padding: 4px 20px 8px 12px;
-}
-
-entry {
- padding: 4px 12px 8px 20px;
-}
-
-listview {
- cycle: false;
-}
-
-element {
- padding: 6px 24px;
-}
-
-element selected {
- background-color: #073642;
- text-color: #e0e0e0;
-}
-
-element-icon {
- size: 20px;
-}
\ No newline at end of file
diff --git a/config/rofi/rofi-power-menu b/config/rofi/rofi-power-menu
deleted file mode 100755
index a84a450..0000000
--- a/config/rofi/rofi-power-menu
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -u
-
-all=(shutdown reboot suspend hibernate logout lockscreen)
-
-show=("${all[@]}")
-
-declare -A texts
-texts[lockscreen]="lock screen"
-texts[switchuser]="switch user"
-texts[logout]="log out"
-texts[suspend]="suspend"
-texts[hibernate]="hibernate"
-texts[reboot]="reboot"
-texts[shutdown]="shut down"
-
-declare -A icons
-icons[lockscreen]="\uf023"
-icons[switchuser]="\uf518"
-icons[logout]="\uf842"
-icons[suspend]="\uf9b1"
-icons[hibernate]="\uf7c9"
-icons[reboot]="\ufc07"
-icons[shutdown]="\uf011"
-icons[cancel]="\u00d7"
-
-declare -A actions
-actions[lockscreen]="loginctl lock-session $XDG_SESSION_ID"
-actions[logout]="loginctl terminate-session $XDG_SESSION_ID"
-actions[suspend]="systemctl suspend"
-actions[hibernate]="systemctl hibernate"
-actions[reboot]="systemctl reboot"
-actions[shutdown]="systemctl poweroff"
-
-confirmations=(reboot shutdown logout)
-dryrun=false
-showsymbols=true
-
-function check_valid {
- option="$1"
- shift 1
- for entry in "${@}"
- do
- if [ -z "${actions[$entry]+x}" ]
- then
- echo "Invalid choice in $1: $entry" >&2
- exit 1
- fi
- done
-}
-
-parsed=$(getopt --options=h --longoptions=help,dry-run,confirm:,choices:,choose:,symbols,no-symbols --name "$0" -- "$@")
-if [ $? -ne 0 ]; then
- echo 'Terminating...' >&2
- exit 1
-fi
-eval set -- "$parsed"
-unset parsed
-while true; do
- case "$1" in
- "-h"|"--help")
- echo "rofi-power-menu - a power menu mode for Rofi"
- echo
- echo "Usage: rofi-power-menu [--choices CHOICES] [--confirm CHOICES]"
- echo " [--choose CHOICE] [--dry-run] [--symbols|--no-symbols]"
- echo
- echo "Use with Rofi in script mode. For instance, to ask for shutdown or reboot:"
- echo
- echo " rofi -show menu -modi \"menu:rofi-power-menu --choices=shutdown/reboot\""
- echo
- echo "Available options:"
- echo " --dry-run Don't perform the selected action but print it to stderr."
- echo " --choices CHOICES Show only the selected choices in the given order. Use / "
- echo " as the separator. Available choices are lockscreen, logout,"
- echo " suspend, hibernate, reboot and shutdown. By default, all"
- echo " available choices are shown."
- echo " --confirm CHOICES Require confirmation for the gives choices only. Use / as"
- echo " the separator. Available choices are lockscreen, logout,"
- echo " suspend, hibernate, reboot and shutdown. By default, only"
- echo " irreversible actions logout, reboot and shutdown require"
- echo " confirmation."
- echo " --choose CHOICE Preselect the given choice and only ask for a confirmation"
- echo " (if confirmation is set to be requested). It is strongly"
- echo " recommended to combine this option with --confirm=CHOICE"
- echo " if the choice wouldn't require confirmation by default."
- echo " Available choices are lockscreen, logout, suspend,"
- echo " hibernate, reboot and shutdown."
- echo " --[no-]symbols Show Unicode symbols or not. Requires a font with support"
- echo " for the symbols. Use, for instance, fonts from the"
- echo " Nerdfonts collection. By default, they are shown"
- echo " -h,--help Show this help text."
- exit 0
- ;;
- "--dry-run")
- dryrun=true
- shift 1
- ;;
- "--confirm")
- IFS='/' read -ra confirmations <<< "$2"
- check_valid "$1" "${confirmations[@]}"
- shift 2
- ;;
- "--choices")
- IFS='/' read -ra show <<< "$2"
- check_valid "$1" "${show[@]}"
- shift 2
- ;;
- "--choose")
- check_valid "$1" "$2"
- selectionID="$2"
- shift 2
- ;;
- "--symbols")
- showsymbols=true
- shift 1
- ;;
- "--no-symbols")
- showsymbols=false
- shift 1
- ;;
- "--")
- shift
- break
- ;;
- *)
- echo "Internal error" >&2
- exit 1
- ;;
- esac
-done
-
-function write_message {
- icon="$1"
- text="$2"
- if [ "$showsymbols" = "true" ]
- then
- echo -n "\u200e$icon \u2068$text\u2069"
- else
- echo -n "$text"
- fi
-}
-
-function print_selection {
- echo -e "$1" | $(read -r -d '' entry; echo "echo $entry")
-}
-
-declare -A messages
-declare -A confirmationMessages
-for entry in "${all[@]}"
-do
- messages[$entry]=$(write_message "${icons[$entry]}" "${texts[$entry]^}")
-done
-for entry in "${all[@]}"
-do
- confirmationMessages[$entry]=$(write_message "${icons[$entry]}" "Yes, ${texts[$entry]}")
-done
-confirmationMessages[cancel]=$(write_message "${icons[cancel]}" "No, cancel")
-
-if [ $# -gt 0 ]
-then
- selection="${@}"
-else
- if [ -n "${selectionID+x}" ]
- then
- selection="${messages[$selectionID]}"
- fi
-fi
-
-echo -e "\0no-custom\x1ftrue"
-echo -e "\0markup-rows\x1ftrue"
-
-if [ -z "${selection+x}" ]
-then
- echo -e "\0prompt\x1fPower menu"
- for entry in "${show[@]}"
- do
- echo -e "${messages[$entry]}\0icon\x1f${icons[$entry]}"
- done
-else
- for entry in "${show[@]}"
- do
- if [ "$selection" = "$(print_selection "${messages[$entry]}")" ]
- then
- for confirmation in "${confirmations[@]}"
- do
- if [ "$entry" = "$confirmation" ]
- then
- echo -e "\0prompt\x1fAre you sure"
- echo -e "${confirmationMessages[$entry]}\0icon\x1f${icons[$entry]}"
- echo -e "${confirmationMessages[cancel]}\0icon\x1f${icons[cancel]}"
- exit 0
- fi
- done
- selection=$(print_selection "${confirmationMessages[$entry]}")
- fi
- if [ "$selection" = "$(print_selection "${confirmationMessages[$entry]}")" ]
- then
- if [ $dryrun = true ]
- then
- echo "Selected: $entry" >&2
- else
- ${actions[$entry]}
- fi
- exit 0
- fi
- if [ "$selection" = "$(print_selection "${confirmationMessages[cancel]}")" ]
- then
- exit 0
- fi
- done
- echo "Invalid selection: $selection" >&2
- exit 1
-fi
\ No newline at end of file
diff --git a/config/sublime-text-3/Default (Linux).sublime-keymap b/config/sublime-text-3/Default (Linux).sublime-keymap
deleted file mode 100644
index 0e7469c..0000000
--- a/config/sublime-text-3/Default (Linux).sublime-keymap
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- // Unbind's
- { "keys": ["ctrl+b"], "command": null },
- { "keys": ["ctrl+shift+x"],"command": null },
- // Bind's
- { "keys": ["ctrl+shift+`"], "command": "ecsstractor", "args": {"bem_nesting": true } },
- { "keys": ["ctrl+`"], "command": "ecsstractor"},
- { "keys": ["ctrl+b"], "command": "toggle_side_bar" }
-]
diff --git a/config/sublime-text-3/Package Control.sublime-settings b/config/sublime-text-3/Package Control.sublime-settings
deleted file mode 100644
index 8da6733..0000000
--- a/config/sublime-text-3/Package Control.sublime-settings
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "bootstrapped": true,
- "in_process_packages": [],
- "installed_packages": [
- "A File Icon",
- "Agila Theme",
- "AutoFileName",
- "ayu",
- "BracketHighlighter",
- "Color Highlight",
- "ColorPicker",
- "Discord Rich Presence",
- "eCSStractor",
- "Emmet",
- "Package Control",
- "Sass"
- ]
-}
diff --git a/config/sublime-text-3/Preferences.sublime-settings b/config/sublime-text-3/Preferences.sublime-settings
deleted file mode 100644
index 3f37d92..0000000
--- a/config/sublime-text-3/Preferences.sublime-settings
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "color_scheme": "Packages/ayu/ayu-mirage.sublime-color-scheme",
- "theme": "ayu-mirage.sublime-theme",
- "auto_complete": true,
- "draw_indent_guides": false,
- "draw_white_space": "all",
- "file_exclude_patterns": [ "package-lock.json" ],
- "folder_exclude_patterns": [ "node_modules" ],
- "font_size": 10,
- "ignored_packages": [ "Vintage" ],
- "margin": 0,
- "remeber_open_files": true,
- "save_on_focus_lost": true,
- "tab_size": 4,
- "translate_tabs_to_spaces": true,
- "trim_trailing_white_space_on_save": false,
- "update_check": false,
- "word_wrap": true
-}
diff --git a/config/tint2/tint2rc b/config/tint2/tint2rc
new file mode 100644
index 0000000..c699d25
--- /dev/null
+++ b/config/tint2/tint2rc
@@ -0,0 +1,223 @@
+#---- Generated by tint2conf 41e4 ----
+# See https://gitlab.com/o9000/tint2/wikis/Configure for
+# full documentation of the configuration options.
+#-------------------------------------
+# Gradients
+#-------------------------------------
+# Backgrounds
+# Background 1: Active taskbar, Battery, Clock, Launcher, Systray, Tooltip
+rounded = 0
+border_width = 0
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
+background_color = #262a2b 100
+border_color = #222222 0
+background_color_hover = #000000 80
+border_color_hover = #000000 0
+background_color_pressed = #000000 80
+border_color_pressed = #000000 0
+
+# Background 2: Active task
+rounded = 0
+border_width = 0
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
+background_color = #008dcd 100
+border_color = #272727 0
+background_color_hover = #272727 70
+border_color_hover = #272727 0
+background_color_pressed = #272727 70
+border_color_pressed = #272727 0
+
+# Background 3: Urgent task
+rounded = 0
+border_width = 0
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
+background_color = #ff8066 60
+border_color = #d98282 0
+background_color_hover = #d98282 60
+border_color_hover = #d98282 0
+background_color_pressed = #d98282 60
+border_color_pressed = #d98282 0
+
+# Background 4: Default task
+rounded = 0
+border_width = 0
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
+background_color = #262a2b 100
+border_color = #242424 0
+background_color_hover = #242424 60
+border_color_hover = #242424 0
+background_color_pressed = #242424 60
+border_color_pressed = #242424 0
+
+# Background 5: Iconified task
+rounded = 0
+border_width = 0
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
+background_color = #262a2b 60
+border_color = #252525 0
+background_color_hover = #252525 60
+border_color_hover = #252525 0
+background_color_pressed = #252525 60
+border_color_pressed = #252525 0
+
+#-------------------------------------
+# Panel
+panel_items = TSC
+panel_size = 100% 26
+panel_margin = 0 0
+panel_padding = 0 0 0
+panel_background_id = 0
+wm_menu = 1
+panel_dock = 0
+panel_pivot_struts = 0
+panel_position = bottom center horizontal
+panel_layer = top
+panel_monitor = all
+panel_shrink = 0
+autohide = 0
+autohide_show_timeout = 0.3
+autohide_hide_timeout = 1.5
+autohide_height = 1
+strut_policy = follow_size
+panel_window_name = tint2
+disable_transparency = 0
+mouse_effects = 0
+font_shadow = 0
+mouse_hover_icon_asb = 100 0 10
+mouse_pressed_icon_asb = 100 0 0
+scale_relative_to_dpi = 0
+scale_relative_to_screen_height = 0
+
+#-------------------------------------
+# Taskbar
+taskbar_mode = single_desktop
+taskbar_hide_if_empty = 0
+taskbar_padding = 0 0 0
+taskbar_background_id = 0
+taskbar_active_background_id = 1
+taskbar_name = 1
+taskbar_hide_inactive_tasks = 0
+taskbar_hide_different_monitor = 0
+taskbar_hide_different_desktop = 0
+taskbar_always_show_all_desktop_tasks = 0
+taskbar_name_padding = 6 7
+taskbar_name_background_id = 0
+taskbar_name_active_background_id = 0
+taskbar_name_font = Droid Sans Bold 8
+taskbar_name_font_color = #d1d1d1 100
+taskbar_name_active_font_color = #aaaaaa 100
+taskbar_distribute_size = 0
+taskbar_sort_order = none
+task_align = left
+
+#-------------------------------------
+# Task
+task_text = 1
+task_icon = 0
+task_centered = 1
+urgent_nb_of_blink = 20
+task_maximum_size = 200 0
+task_padding = 8 6 8
+task_font = Droid Sans Bold 8
+task_tooltip = 1
+task_thumbnail = 0
+task_thumbnail_size = 210
+task_font_color = #cccccc 100
+task_active_font_color = #ffffff 100
+task_urgent_font_color = #cccccc 100
+task_iconified_font_color = #cccccc 80
+task_icon_asb = 100 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 80 0 0
+task_background_id = 4
+task_active_background_id = 2
+task_urgent_background_id = 3
+task_iconified_background_id = 5
+mouse_left = toggle_iconify
+mouse_middle = close
+mouse_right = none
+mouse_scroll_up = none
+mouse_scroll_down = none
+
+#-------------------------------------
+# System tray (notification area)
+systray_padding = 8 0 12
+systray_background_id = 1
+systray_sort = right2left
+systray_icon_size = 18
+systray_icon_asb = 100 0 0
+systray_monitor = 1
+systray_name_filter =
+
+#-------------------------------------
+# Launcher
+launcher_padding = 8 0 16
+launcher_background_id = 1
+launcher_icon_background_id = 0
+launcher_icon_size = 16
+launcher_icon_asb = 100 0 0
+launcher_icon_theme_override = 0
+startup_notifications = 0
+launcher_tooltip = 0
+
+#-------------------------------------
+# Clock
+time1_format = %H:%M
+time2_format = %d.%m.%Y
+time1_font = Droid Sans Bold 8
+time1_timezone = Europe/Kiev
+time2_timezone =
+time2_font = Droid Sans 7
+clock_font_color = #d1d1d1 100
+clock_padding = 4 2
+clock_background_id = 1
+clock_tooltip =
+clock_tooltip_timezone =
+clock_lclick_command =
+clock_rclick_command =
+clock_mclick_command =
+clock_uwheel_command =
+clock_dwheel_command =
+
+#-------------------------------------
+# Battery
+battery_tooltip = 1
+battery_low_status = 20
+battery_low_cmd = notify-send "battery low"
+battery_full_cmd =
+bat1_font = Droid Sans Bold 8
+bat2_font = Droid Sans Bold 8
+battery_font_color = #d1d1d1 100
+bat1_format =
+bat2_format =
+battery_padding = 2 0
+battery_background_id = 1
+battery_hide = 96
+battery_lclick_command =
+battery_rclick_command =
+battery_mclick_command =
+battery_uwheel_command =
+battery_dwheel_command =
+ac_connected_cmd =
+ac_disconnected_cmd =
+
+#-------------------------------------
+# Tooltip
+tooltip_show_timeout = 1
+tooltip_hide_timeout = 0
+tooltip_padding = 6 6
+tooltip_background_id = 1
+tooltip_font_color = #d1d1d1 100
+tooltip_font = Droid Sans Bold 8
+
diff --git a/conkyrc b/conkyrc
index 0a830d4..a47e25f 100644
--- a/conkyrc
+++ b/conkyrc
@@ -13,7 +13,7 @@ conky.config = {
alignment = 'top_right',
gap_x = 40,
gap_y = 60,
- minimum_height = 200,
+ minimum_height = 50,
minimum_width = 200,
maximum_width = 700,
border_inner_margin = 10,
@@ -37,7 +37,7 @@ conky.config = {
font = 'Jatbrains Mono',
max_text_width = 0,
max_user_text = 16384,
- override_utf8_locale = false,
+ override_utf8_locale = true,
short_units = true,
top_name_width = 21,
top_name_verbose = false,
@@ -62,7 +62,7 @@ conky.config = {
conky.text = [[
${voffset 10}${font Jatbrains Mono:weight=Bold:size=14}${color1}Todo: ${font Jatbrains Mono:weight=Medium:size=10}${color2}${font}
-${exec cat -n "$HOME/.todo" | fmt -s -w 50}\
+${font Jatbrains Mono:weight=Medium:size=10}${exec cat -n "$HOME/.todo" | fmt -s -w 66}\
${color1}
${font}
]]
diff --git a/gitconfig b/gitconfig
index 1da676e..12a7c4f 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,34 +1,34 @@
[user]
username = Smirnov-O
name = Smirnov Olexandr
- email = ss2316544@gmail.com
+ email = ss2316544@gmail.com
[github]
name = Smirnov-O
[web]
- browser = firefox
- #browser = google-chrome
+ browser = chromium # firefox, google-chrome,
[core]
- editor = vim
+ editor = vim
+ excludesfile = ~/.gitignore_global
[alias]
- ada = add -A
- rmc = rm --cached
+ ada = add -A
cm = commit
cmm = commit -m
- ch = checkout
- cl = clone
- st = status
+ ch = checkout
+ cl = clone
+ st = status
br = branch
l = log
+ i = init
[color]
- ui = true
- interactive = true
- branch = true
- status = true
+ ui = true
+ interactive = true
+ branch = true
+ status = true
[credential]
- helper = cache --timeout=1800
+ helper = cache --timeout=1800
diff --git a/gitignore_global b/gitignore_global
index 80fef2a..987474c 100644
--- a/gitignore_global
+++ b/gitignore_global
@@ -1,42 +1,28 @@
-## IDE ##
-.vscode/*
-.idea/*
+# IDE
+.idea
+*~
+~*
-## OS: Linux, Windows, Mac OS X ##
-.directory
-.Trash-*
-Thumbs.db
-ehthumbs.db
-*.stackdump
-[Dd]esktop.ini
-.DS_Store
+# Logs and databases
+*.log
+*.sqlite
+*.db
+*.todo
-## Python files ##
+# Temp files
+*.pyc
+*.swp
+.*.swp
+*.swo
__pycache__
-venv
-env
-*.py[cod]
-dist/
-## Golang ##
-/Godeps/
+# Packages
+*.7z
+*.rar
+*.tar
+*.bz2
+
+# Compiled siurce
+*.so
*.out
-
-## JS/TS ##
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-node_modules/
-jspm_packages/
-typings/
-.npm
-dist/
-
-## db ##
-db.sqlite3
-db.db
-
-## DotEnv ##
-.env
-.dotenv
-.env.sh
+*.bin
diff --git a/script/change-shell.sh b/script/change-shell.sh
deleted file mode 100755
index 8b3e363..0000000
--- a/script/change-shell.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- "help"|"--help")
- echo "bash Change default shell to bash"
- echo "zsh Change default shell to zsh"
- echo "fish Change default shell to fish"
- ;;
- bash) chsh -s $(whitch bash) ;;
- zsh) chsh -s $(whitch zsh) ;;
- fish) chsh -s $(whitch fish) ;;
-esac
diff --git a/script/dmenu/dmenu-config-edit.sh b/script/dmenu/dmenu-config-edit.sh
index a2e86ec..ce00fce 100755
--- a/script/dmenu/dmenu-config-edit.sh
+++ b/script/dmenu/dmenu-config-edit.sh
@@ -3,11 +3,12 @@
declare options=("i3
berry
qtile
+openbox
polybar
picom
dunst
qutebrowser
-quickmarks
+tmux
vim
neovim
kitty
@@ -15,24 +16,43 @@ taskwarrior
fish
zsh")
-choice=$(echo -e "${options[@]}" | dmenu -h 24 -p 'Edit config file: ')
-
+choice=$(echo -e "${options[@]}" | dmenu -p 'Edit config file: ' $@)
case "$choice" in
i3) choice="$HOME/.config/i3/config" ;;
- qtile) choice="$HOME/.config/qtile/config.py" ;;
+ qtile)
+ opt=$(echo -e "config.py\nautostart"|dmenu -p 'Qtile' $@)
+ case "$opt" in
+ "config.py") choice="$HOME/.config/qtile/config.py" ;;
+ "autostart") choice="$HOME/.config/qtile/autostart.sh" ;;
+ esac
+ ;;
berry)
- declare opt=("berry\npolybar\nsxhkd")
- why=$(echo -e "${opt}" | dmenu -h 24 -p 'Berry')
- case "$why" in
+ declare opt=$(echo -e "berry\npolybar\nsxhkd"|dmenu -p 'Berry' $@)
+ case "$opt" in
"berry") choice="$HOME/.config/berry/autostart" ;;
"polybar") choice="$HOME/.config/berry/polybar/polybar" ;;
"sxhkd") choice="$HOME/.config/berry/sxhkdrc" ;;
esac
+ ;;
+ openbox)
+ opt=$(echo -e "openbox\nautostart\nmenu\nreload"|dmenu -p 'OpenBox' $@)
+ case "$opt" in
+ "openbox") choice="$HOME/.config/openbox/rc.xml" ;;
+ "autostart") choice="$HOME/.config/openbox/autostart" ;;
+ "menu") choice="$HOME/.config/openbox/menu.xml" ;;
+ "reload") openbox --reconfigure && pkill kitty ;;
+ esac
;;
picom) choice="$HOME/.config/picom.conf" ;;
+ tmux) choice="$HOME/.tmux.conf" ;;
polybar) choice="$HOME/.config/polybar/config" ;;
- quickmarks) choice="$HOME/.config/qutebrowser/quickmarks" ;;
- qutebrowser) choice="$HOME/.config/qutebrowser/config.py" ;;
+ qutebrowser)
+ why=$(echo -e "config.py\nquickmarks" | dmenu -h 24 -p 'Qutebrowser')
+ case "$why" in
+ "config.py") choice="$HOME/.config/qutebrowser/config.py" ;;
+ "quickmarks") choice="$HOME/.config/qutebrowser/quickmarks" ;;
+ esac
+ ;;
vim) choice="$HOME/.vimrc" ;;
nvim) choice="$HOME/.config/nvim/init.vim" ;;
dunst) choice="$HOME/.config/dunst/dunstrc" ;;
@@ -40,7 +60,6 @@ case "$choice" in
taskwarior) choice="$HOME/.taskrc" ;;
fish) choice="$HOME/.config/fish/config.fish" ;;
kitty) choice="$HOME/.config/kitty/kitty.conf" ;;
- quit) echo "Program terminated." && exit 1 ;;
*) exit 1 ;;
esac
kitty -e nvim "$choice"
diff --git a/script/dmenu/dmenu-power.sh b/script/dmenu/dmenu-power.sh
index 90e55c4..b10d9dc 100755
--- a/script/dmenu/dmenu-power.sh
+++ b/script/dmenu/dmenu-power.sh
@@ -6,12 +6,12 @@ Logout
Suspend
Lock Screen")
-choice=$(echo -e "${options[@]}" | dmenu -h 24 -p 'Power')
+choice=$(echo -e "${options[@]}" | dmenu -p 'Power' $@)
case "$choice" in
"Shut Down")
declare opt=("Yes\nNo")
- yesno=$(echo -e "${opt[@]}" | dmenu -h 24 -p 'Power')
+ yesno=$(echo -e "${opt[@]}" | dmenu -p 'Power' $@)
case "$yesno" in
"Yes") exec systemctl poweroff ;;
"No") exec exit 0 ;;
@@ -19,7 +19,7 @@ case "$choice" in
;;
"Reboot")
declare opt=("Yes\nNo")
- yesno=$(echo -e "${opt[@]}" | dmenu -h 24 -p 'Power')
+ yesno=$(echo -e "${opt[@]}" | dmenu -p 'Power' $@)
case "$yesno" in
"Yes") exec systemctl reboot ;;
"No") exec exit 0 ;;
@@ -27,7 +27,7 @@ case "$choice" in
;;
"Logout")
declare opt=("Yes\nNo")
- yesno=$(echo -e "${opt[@]}" | dmenu -h 24 -p 'Power')
+ yesno=$(echo -e "${opt[@]}" | dmenu -p 'Power' $@)
case "$yesno" in
"Yes") exec loginctl terminate-session $XDG_SESSION_ID ;;
"No") exec exit 0 ;;
@@ -35,7 +35,7 @@ case "$choice" in
;;
"Lock Screen")
declare opt=("Yes\nNo")
- yesno=$(echo -e "${opt[@]}" | dmenu -h 24 -p 'Power')
+ yesno=$(echo -e "${opt[@]}" | dmenu -p 'Power' $@)
case "$yesno" in
"Yes") exec loginctl lock-session $XDG_SESSION_ID ;;
"No") exec exit 0 ;;
diff --git a/script/mfet.sh b/script/mfet.sh
new file mode 100644
index 0000000..73c1cc5
--- /dev/null
+++ b/script/mfet.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#### Info ####
+shell=$(echo $SHELL | sed -e 's|/bin/||g')
+os=$(lsb_release -sdr | sed -e 's|"||g')
+host=$(hostname)
+user=$(echo $USER)
+kernal=$(uname -r)
+editor=$(echo $EDITOR)
+uptime=$(uptime -p|sed 's|up ||g'|sed 's|,||g')
+
+### Colors ###
+rest="\e[0m"
+bold="\e[1m"
+blue="\e[34m"
+grey="\e[90m"
+
+#### Code ####
+echo -e " ${blue}${user}${rest}${grey}@${blue}${host}"
+echo -e " ${blue} os ${rest}${grey}~ ${rest}${os}"
+echo -e " ${blue} sh ${rest}${grey}~ ${rest}${shell}"
+echo -e " ${blue}kernal ${rest}${grey}~ ${rest}${kernal}"
+echo -e " ${blue}editor ${rest}${grey}~ ${rest}${editor}"
+echo -e " ${blue}uptime ${rest}${grey}~ ${rest}${uptime}"
diff --git a/tmux.conf b/tmux.conf
new file mode 100644
index 0000000..215c9ef
--- /dev/null
+++ b/tmux.conf
@@ -0,0 +1,38 @@
+set -g default-terminal "screen-256color"
+set-option -sa terminal-overrides ",*:Tc"
+#set-option -sa terminal-overrides ",xterm-kitty:RGB"
+set -g history-limit 1000
+set -g base-index 1
+set -g pane-base-index 1
+set -g mouse on
+setw -g mouse on
+
+# Keybindongs
+set -g xterm-keys no
+set -g prefix C-a
+bind -n End send-key C-e
+bind -n Home send-key C-a
+bind-key -n Home send Escape "OH"
+bind-key -n End send Escape "OF"
+bind r source-file ~/.tmux.conf \; display 'Reloaded tmux config'
+bind - split-window -v
+bind _ split-window -h
+bind Tab last-window
+bind -r h select-pane -L
+bind -r j select-pane -D
+bind -r k select-pane -U
+bind -r l select-pane -R
+bind -r H resize-pane -L 2
+bind -r J resize-pane -D 2
+bind -r K resize-pane -U 2
+bind -r L resize-pane -R 2
+
+# Status bar
+set -g status-bg black
+set -g status-fg white
+set -g status-left ' '
+set -g status-right ' #{?client_prefix,*,} #S '
+set -g status-style fg=colour110
+set -g pane-border-style fg=colour240
+set -g pane-active-border-style fg=colour39
+set-window-option -g window-status-current-style fg=colour39
diff --git a/vimrc b/vimrc
deleted file mode 100644
index 9a77365..0000000
--- a/vimrc
+++ /dev/null
@@ -1,97 +0,0 @@
-call plug#begin('~/.vim/plugged')
- Plug 'jiangmiao/auto-pairs'
- Plug 'ayu-theme/ayu-vim'
-call plug#end()
-
-set nocompatible " be iMproved
-set laststatus=2
-
-set number " Number line
-"set relativenumber " Number line
-
-syntax on " Support syntax
-set ruler " Cursor position
-set t_Co=256 " Enable 265 colors
-
-set mouse=a " Mouse support
-set mousehide " Mouse hide
-
-set encoding=utf-8 " Use utf-8 encoding
-
-set fileencodings=utf8,cp1251
-
-set cursorline " The line with the cursor will be highlighted
-set wrap " Line wrappingv
-set linebreak " Line wrappingv
-
-set nobackup " Disable backup files
-set noswapfile " Disable *.swp files
-set history=50 " History size 1000 edits
-set autoread " Auto reade file for edit
-
-set showmode
-set showcmd
-
-" Tab
-set tabstop=4 " Tab size 4
-set shiftwidth=4 " Tab size 4
-set softtabstop=4 " Tab size 4
-set expandtab " Tab consist of space
-set smarttab
-set autoindent
-
-" Search
-set incsearch " Highlighted
-set ignorecase " Highlighted
-set smartcase " Smart Rigger
-
-" Buffers
-set hidden
-set smartindent
-
-set visualbell t_vb= " Mute Vim
-
-" ColoerCheme
-set termguicolors
-set background=dark
-let ayucolor="mirage"
-colorscheme ayu
-
-""""""""""
-" MAPING "
-""""""""""
-let mapleader=',' " Leader key
-
-" Smart way to move between windows
-map j
-map k
-map h
-map l
-
-" Tabs
-map tn :tabnew " Create new tab
-map tc :tabclose " Tab kill
-map 1 :tabn 1 " Change tab
-map 2 :tabn 2 " Change tab
-map 3 :tabn 3 " Change tab
-map 4 :tabn 4 " Change tab
-map 5 :tabn 5 " Change tab
-map 6 :tabn 6 " Change tab
-map 7 :tabn 7 " Change tab
-map 8 :tabn 8 " Change tab
-map 9 :tabn 9 " Change tab
-
-" Bufer
-nnoremap :bnext
-nnoremap :bprev
-
-""""""""
-" GVIM "
-""""""""
-if has("gui_running")
- set guioptions -=m
- set guioptions -=T
- map p "+gP " Past text in buffer
- map :tabnext " Change tab
- map :tabprev " Change tab
-endif
diff --git a/zshrc b/zshrc
index 2335911..ee3d38a 100644
--- a/zshrc
+++ b/zshrc
@@ -1,5 +1,6 @@
export ZSH="/home/sasha/.oh-my-zsh"
source ~/.env
+source ~/.profile
### Oh my zsh ###
@@ -7,21 +8,27 @@ ZSH_THEME="cyan-simple" # Set theme
#CASE_SENSITIVE="true" # Use case-sensitive completion.
#HYPHEN_INSENSITIVE="true" # Case-sensitive completion must be off.
#DISABLE_AUTO_UPDATE="true" # Disable bi-weekly auto-update checks.
-DISABLE_UPDATE_PROMPT="true" # Automatically update without prompting.
-export UPDATE_ZSH_DAYS=13 # Change how often to auto-update.
+#DISABLE_UPDATE_PROMPT="true" # Automatically update without prompting.
#DISABLE_MAGIC_FUNCTIONS="true" # If pasting URLs and other text is messed up.
#DISABLE_LS_COLORS="true" # Disable colors in ls.
-#DISABLE_AUTO_TITLE="true" # Disable auto-setting terminal title.
+#DISABLE_AUTO_TITLE="true" # Disable auto-setting terminal title.
#ENABLE_CORRECTION="true" # Enable command auto-correction.
#COMPLETION_WAITING_DOTS="true" # Display red dots whilst waiting for completion.
+export UPDATE_ZSH_DAYS=13 # Change how often to auto-update.
export LANG=en_US.UTF-8 # Set locale
-plugins=(pip python sudo git taskwarrior)
+plugins=(pip python sudo heroku git taskwarrior)
source $ZSH/oh-my-zsh.sh
+
+### Variables ###
+export EDITOR="nvim"
+export VISUAL="nvim"
+
### Aliases ###
alias cls="clear"
-alias :q
+alias :q="exit"
+alias tmux="tmux -2"
alias ..="cd .."
alias ...="cd ../.."