diff options
| -rw-r--r-- | alacritty/alacritty.yml | 5 | ||||
| -rw-r--r-- | bash/.bashrc | 3 | ||||
| -rw-r--r-- | i3/config | 47 | ||||
| -rwxr-xr-x | install.sh | 45 | ||||
| -rw-r--r-- | mbsync/.mbsyncrc | 3 | ||||
| -rw-r--r-- | neomutt/neomuttrc | 27 | ||||
| -rw-r--r-- | py3status/config | 46 | ||||
| -rw-r--r-- | qtile/config.py | 351 | ||||
| -rw-r--r-- | sway/.Xresources | 3 | ||||
| -rw-r--r-- | sway/config | 126 | ||||
| -rw-r--r-- | sxhkd/sxhkdrc.i3 | 46 | ||||
| -rw-r--r-- | sxhkd/terminal_i3.py | 58 | ||||
| -rw-r--r-- | vim/.vimrc | 13 | ||||
| -rw-r--r-- | waybar/config | 24 | ||||
| -rw-r--r-- | xonsh/.xonshrc | 3 | ||||
| -rwxr-xr-x | xorg/.xsession | 6 | ||||
| -rw-r--r-- | yabar/yabar.conf | 34 |
17 files changed, 57 insertions, 783 deletions
diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index 6f07fb8..774fa4d 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -36,6 +36,8 @@ window: # - none: Neither borders nor title bar decorations: full + dynamic_title: true + scrolling: # Maximum number of lines in the scrollback buffer. # Specifying '0' will disable scrolling. @@ -198,7 +200,7 @@ colors: # - Linear # # Specifying a `duration` of `0` will disable the visual bell. -visual_bell: +bell: animation: EaseOutExpo duration: 0 @@ -259,7 +261,6 @@ selection: # clipboard. save_to_clipboard: false -dynamic_title: true cursor: # Cursor style diff --git a/bash/.bashrc b/bash/.bashrc index 8da6ab6..a355b0c 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -7,6 +7,3 @@ alias ls='ls --color=auto' PS1='[\u@\h \W]\$ ' - -# added by travis gem -[ -f /home/bozo/.travis/travis.sh ] && source /home/bozo/.travis/travis.sh diff --git a/i3/config b/i3/config deleted file mode 100644 index 82492ba..0000000 --- a/i3/config +++ /dev/null @@ -1,47 +0,0 @@ - -set $mod Mod4 -set $ws1 "1:1" -set $ws2 "2:2" -set $ws3 "3:3" -set $ws4 "4:4" -set $wsa "5:a" -set $wss "6:s" -set $wsd "7:d" -set $wsf "8:f" -set $wst "9:term" - -floating_modifier $mod -font pango:Droid Sans 11 -default_border normal 3 - -workspace $ws1 output primary -workspace $ws2 output primary -workspace $ws3 output primary -workspace $ws4 output primary -workspace $wsa output DP1-1 DP1-2 DP1 primary -workspace $wss output DP1-1 DP1-2 DP1 primary -workspace $wsd output DP1-1 DP1-2 DP1 primary -workspace $wsf output DP1-1 DP1-2 DP1 primary - -bindsym $mod+1 workspace $ws1 -bindsym $mod+2 workspace $ws2 -bindsym $mod+3 workspace $ws3 -bindsym $mod+4 workspace $ws4 -bindsym $mod+a workspace $wsa -bindsym $mod+s workspace $wss -bindsym $mod+d workspace $wsd -bindsym $mod+f workspace $wsf - -bindsym $mod+Shift+1 move container to workspace $ws1 -bindsym $mod+Shift+2 move container to workspace $ws2 -bindsym $mod+Shift+3 move container to workspace $ws3 -bindsym $mod+Shift+4 move container to workspace $ws4 -bindsym $mod+Shift+a move container to workspace $wsa -bindsym $mod+Shift+s move container to workspace $wss -bindsym $mod+Shift+d move container to workspace $wsd -bindsym $mod+Shift+f move container to workspace $wsf - -exec --no-startup-id sxhkd -c ~/.config/sxhkd/sxhkdrc.i3 -exec --no-startup-id ~/.config/polybar/launch.sh - -for_window [instance="scratchpad_term"] move container to workspace $wst @@ -1,8 +1,8 @@ -#!/bin/bash +#!/usr/bin/env bash set -e -DOTFILES=~/.dotfiles +DOTFILES=$(realpath $(dirname ${BASH_SOURCE[0]})) # alacritty ln -sf -T $DOTFILES/alacritty ~/.config/alacritty @@ -19,6 +19,12 @@ ln -sf $DOTFILES/bash/.profile ~/.profile ln -sf $DOTFILES/bash/.bashrc ~/.bashrc ln -sf ~/.profile ~/.bash_profile +# bspwm +ln -sf -T $DOTFILES/bspwm ~/.config/bspwm + +# fish +ln -sf -T $DOTFILES/fish ~/.config/fish + # git ln -sf $DOTFILES/git/.gitconfig ~/.gitconfig @@ -26,33 +32,15 @@ ln -sf $DOTFILES/git/.gitconfig ~/.gitconfig mkdir -p ~/mail/ket ln -sf $DOTFILES/mbsync/.mbsyncrc ~/.mbsyncrc -# qtile -ln -sf -T $DOTFILES/qtile ~/.config/qtile - -# i3 -ln -sf -T $DOTFILES/i3 ~/.config/i3 - -# bspwm -ln -sf -T $DOTFILES/bspwm ~/.config/bspwm - -# sxhkd -ln -sf -T $DOTFILES/sxhkd ~/.config/sxhkd - -# sway -ln -sf -T $DOTFILES/sway ~/.config/sway - -# waybar -ln -sf -T $DOTFILES/waybar ~/.config/waybar +# neomutt +ln -sf -T $DOTFILES/neomutt ~/.config/neomutt -# py3status -ln -sf -T $DOTFILES/py3status ~/.config/py3status +# pictures +ln -sf -T $DOTFILES/pictures ~/.pictures # polybar ln -sf -T $DOTFILES/polybar ~/.config/polybar -# polybar -ln -sf -T $DOTFILES/yabar ~/.config/yabar - # qutebrowser mkdir -p ~/.config/qutebrowser ln -sf $DOTFILES/qutebrowser/autoconfig.yml ~/.config/qutebrowser/autoconfig.yml @@ -74,6 +62,9 @@ do ln -sf $DOTFILES/subl3/$i ~/.config/sublime-text-3/Packages/User/$i done +# sxhkd +ln -sf -T $DOTFILES/sxhkd ~/.config/sxhkd + # tmux ln -sf $DOTFILES/tmux/.tmux.conf ~/.tmux.conf @@ -85,12 +76,6 @@ ln -sf $DOTFILES/vim/plug.vim ~/.vim/autoload/plug.vim ln -sf ~/.vimrc ~/.vim/init.vim ln -sf ~/.vim ~/.config/nvim -# xonsh -ln -sf $DOTFILES/xonsh/.xonshrc ~/.xonshrc - -# fish -ln -sf -T $DOTFILES/fish ~/.config/fish - # xorg ln -sf $DOTFILES/xorg/.xsession ~/.xsession ln -sf $DOTFILES/xorg/.Xresources ~/.Xresources diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc index e98a624..1d10725 100644 --- a/mbsync/.mbsyncrc +++ b/mbsync/.mbsyncrc @@ -5,13 +5,14 @@ PassCmd "pass office.com/bozo.kopic" SSLType STARTTLS CertificateFile /etc/ssl/certs/ca-certificates.crt AuthMech PLAIN +PipelineDepth 1 IMAPStore ket-remote Account ket MaildirStore ket-local SubFolders Verbatim -Path ~/mail/ket +Path ~/mail/ket/ Inbox ~/mail/ket/INBOX Channel ket diff --git a/neomutt/neomuttrc b/neomutt/neomuttrc new file mode 100644 index 0000000..aa05d2f --- /dev/null +++ b/neomutt/neomuttrc @@ -0,0 +1,27 @@ +set mbox_type=Maildir +set folder=~/mail/ket +set spoolfile=+INBOX +set sidebar_visible=yes +set sidebar_width=25 +set sort=threads +set sort_aux=reverse-date-received +set pager_index_lines=10 + +mailboxes +INBOX \ + +INBOX/archive \ + +INBOX/hat-core \ + +INBOX/hat-core/active \ + +INBOX/hat-core/pending \ + +INBOX/hat-eds \ + +INBOX/hat-eds/active \ + +INBOX/hat-eds/pending \ + +INBOX/hat-eds-ba \ + +INBOX/hat-eds-ba/active \ + +INBOX/hat-eds-ba/pending \ + +Sent\ Items + +bind index j next-entry +bind index k previous-entry + +macro index J '<sidebar-next><sidebar-open>' +macro index K '<sidebar-prev><sidebar-open>' diff --git a/py3status/config b/py3status/config deleted file mode 100644 index 84c0b2b..0000000 --- a/py3status/config +++ /dev/null @@ -1,46 +0,0 @@ - -order += "wireless _first_" -order += "ethernet _first_" -order += "battery 0" -order += "volume master" -order += "tztime local" - - -wireless _first_ { - format_up = " (%quality at %essid, %bitrate) %ip" - format_down = "" - on_click 1 = "exec --no-startup-id connman-gtk" -} - -ethernet _first_ { - format_up = " %ip (%speed)" - format_down = "" - on_click 1 = "exec --no-startup-id connman-gtk" -} - -battery 0 { - format = "%status %percentage %remaining %emptytime" - format_down = "" - status_chr = "" - status_bat = "" - status_unk = "" - status_full = "" - path = "/sys/class/power_supply/BAT%d/uevent" - low_threshold = 10 -} - - -volume master { - format = " %volume" - format_muted = " muted (%volume)" - on_click 1 = "exec --no-startup-id pavucontrol" - on_click 3 = "exec --no-startup-id pulsemixer --toggle-mute" - on_click 4 = "exec --no-startup-id pulsemixer --max-volume 100 --change-volume +2" - on_click 5 = "exec --no-startup-id pulsemixer --change-volume -2" -} - -tztime local { - format = "%Y-%m-%d %H:%M:%S" -} - - diff --git a/qtile/config.py b/qtile/config.py deleted file mode 100644 index c764f2a..0000000 --- a/qtile/config.py +++ /dev/null @@ -1,351 +0,0 @@ -from libqtile.config import (Group, Key, Click, Drag, Screen, Match) -from libqtile.command import lazy -from libqtile import (layout, bar, widget, hook) -import libqtile -import libqtile.widget.launchbar -import subprocess -import os.path -import itertools -import functools -import contextlib - - -screens_count = str( - subprocess.Popen( - ['xrandr'], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE).communicate()[0] - ).count(" connected ") - - -touchpad_id = None -with contextlib.suppress(Exception): - result = subprocess.run(['xinput'], capture_output=True) - stdout = result.stdout.decode('utf-8') - for i in stdout.split('\n'): - if 'TouchPad' in i: - touchpad_id = int(i.split('id=')[1].split('[')[0].strip()) - - -wlan_dev = None -with contextlib.suppress(Exception): - result = subprocess.run(['ip', 'l'], capture_output=True) - stdout = result.stdout.decode('utf-8') - for i in stdout.split('\n'): - if not i or i[0] in (' ', '\t'): - continue - temp_wlan_dev = i.split(':')[1].strip() - if temp_wlan_dev and temp_wlan_dev[0] == 'w': - wlan_dev = temp_wlan_dev - break - - -mod = 'mod4' - - -groups = [ - Group('1', screen_affinity=0), - Group('2', screen_affinity=0), - Group('3', screen_affinity=0), - Group('4', screen_affinity=0), - Group('a', screen_affinity=1 % screens_count), - Group('s', screen_affinity=1 % screens_count), - Group('d', screen_affinity=1 % screens_count), - Group('f', screen_affinity=1 % screens_count), - # Group('z', screen_affinity=2), - # Group('x', screen_affinity=2), - # Group('c', screen_affinity=2), - # Group('v', screen_affinity=2), - Group('term', layout='max', - matches=[Match(wm_instance_class=['tmux_term'])]) -] - - -bar_background = ['#000000', '#000000', '#333333'] - - -def get_icon_path(name): - return os.path.expanduser('~/.dotfiles/pictures/icons/' + name + '.png') - - -def create_launch_bar(): - return libqtile.widget.launchbar.LaunchBar([ - (get_icon_path('chromium'), 'chromium'), - (get_icon_path('falkon'), 'falkon'), - (get_icon_path('qutebrowser'), 'qutebrowser'), - (get_icon_path('dolphin'), 'dolphin'), - (get_icon_path('atom'), 'atom'), - (get_icon_path('claws-mail'), 'claws-mail'), - (get_icon_path('kmix'), 'pavucontrol'), - (get_icon_path('network'), 'connman-gtk'), - (get_icon_path('keepassxc'), 'keepassxc'), - (get_icon_path('clementine'), 'clementine'), - ], pading=5) - - -def create_top_bar(screen_index): - return bar.Bar([ - widget.CurrentLayoutIcon(scale=0.7), - widget.CurrentLayout(), - widget.Sep(), - widget.WindowName(), - widget.Prompt(name='prompt' + str(screen_index)), - widget.Sep(), - widget.TextBox('Cpu:'), - widget.CPUGraph(), - widget.Sep(), - widget.TextBox('Memory:'), - widget.MemoryGraph(), - widget.Sep(), - widget.TextBox('Net:'), - widget.NetGraph(), - widget.Sep(), - widget.TextBox('Wlan:'), - widget.Wlan(interface=wlan_dev), - widget.Sep(), - widget.TextBox('Battery:'), - widget.Battery(), - widget.Sep(), - widget.TextBox('Volume:'), - widget.Volume(), - widget.Sep(), - widget.Clock(format='%Y-%m-%d %H:%M:%S') - ], 30, background=bar_background) - - -def create_bottom_bar(screen_index): - return bar.Bar([ - widget.GroupBox(disable_drag=True, - fontsize=22, - visible_groups={g.name for g in groups - if g.screen_affinity is None - or g.screen_affinity == screen_index}), - widget.Sep(), - create_launch_bar(), - widget.Sep(), - widget.TaskList(fontsize=20) - ] + ([widget.Systray(icon_size=35)] if screen_index == 0 else []), 35, - background=list(reversed(bar_background))) - - -def create_screen(screen_index): - return Screen( - top=create_top_bar(screen_index), - bottom=create_bottom_bar(screen_index)) - - -screens = [create_screen(i) for i in range(screens_count)] - - -layouts = [ - layout.MonadTall(), - layout.MonadWide(), - layout.Max(), - layout.VerticalTile(), - layout.Zoomy() -] - - -mouse = [ - Drag([mod], "Button1", lazy.window.set_position_floating(), - start=lazy.window.get_position()), - Drag([mod], "Button3", lazy.window.set_size_floating(), - start=lazy.window.get_size()), - Click([mod], "Button2", lazy.window.bring_to_front()) -] - - -def act_focus_group(group, qtile): - qtile.groups_map[group.name].cmd_toscreen(group.screen_affinity) - qtile.cmd_to_screen(group.screen_affinity) - - -def act_move_to_group(group, qtile): - qtile.current_window.cmd_togroup(group.name) - - -def act_F12(qtile): - if qtile.current_group.name != 'term': - for screen in qtile.cmd_screens(): - if screen['group'] == 'term': - qtile.cmd_to_screen(screen['index']) - return - qtile.current_screen.cmd_togglegroup('term') - if qtile.current_group.name == 'term' and not qtile.current_group.windows: - subprocess.Popen(['alacritty', '-e', 'tmux', 'new-session', '-A', - '-s', 'default']) - - -def act_enable_touchpad(qtile): - subprocess.Popen(['xinput', 'enable', str(touchpad_id)]) - - -def act_disable_touchpad(qtile): - subprocess.Popen(['xinput', 'disable', str(touchpad_id)]) - - -def act_left(qtile): - lay = qtile.current_group.layout - scr = qtile.current_screen - scr_next = qtile.screens[(scr.index + 1) % len(qtile.screens)] - change_screen = False - if isinstance(lay, layout.Max): - change_screen = True - elif isinstance(lay, layout.MonadTall): - try: - lay.cmd_left() - except ValueError: - change_screen = True - else: - lay.cmd_previous() - if change_screen: - qtile.cmd_to_screen(scr_next.index) - - -def act_right(qtile): - lay = qtile.current_group.layout - scr = qtile.current_screen - scr_next = qtile.screens[(scr.index + 1) % len(qtile.screens)] - change_screen = False - if isinstance(lay, layout.Max): - change_screen = True - elif isinstance(lay, layout.MonadTall): - try: - lay.cmd_right() - except ValueError: - change_screen = True - else: - lay.cmd_next() - if change_screen: - qtile.cmd_to_screen(scr_next.index) - - -def act_up(qtile): - qtile.current_group.layout.cmd_up() - - -def act_down(qtile): - qtile.current_group.layout.cmd_down() - - -def act_move_left(qtile): - qtile.current_group.layout.cmd_swap_left() - - -def act_move_right(qtile): - qtile.current_group.layout.cmd_swap_right() - - -def act_move_up(qtile): - qtile.current_group.layout.cmd_move_up() - - -def act_move_down(qtile): - qtile.current_group.layout.cmd_move_down() - - -def act_spawncmd(qtile): - qtile.cmd_spawncmd(widget='prompt' + str(qtile.current_screen.index)) - - -keys = list(itertools.chain( - [Key([mod, 'shift'], 'q', lazy.window.kill()), - Key([mod], 'w', lazy.next_layout()), - Key([mod, 'shift'], 'e', lazy.shutdown()), - Key([mod, 'shift'], 'r', lazy.restart()), - - Key([mod], 'Return', lazy.spawn('urxvt')), - Key([mod], 'space', lazy.function(act_spawncmd)), - - - Key([mod], 'Tab', lazy.layout.next()), - Key([mod, 'shift'], 'space', lazy.window.toggle_floating()), - Key([mod, 'shift'], 'Return', lazy.window.toggle_fullscreen()), - - Key([mod], 'h', lazy.function(act_left)), - Key([mod], 'l', lazy.function(act_right)), - Key([mod], 'j', lazy.function(act_down)), - Key([mod], 'k', lazy.function(act_up)), - Key([mod, 'shift'], "h", lazy.function(act_move_left)), - Key([mod, 'shift'], "l", lazy.function(act_move_right)), - Key([mod, 'shift'], "j", lazy.function(act_move_down)), - Key([mod, 'shift'], "k", lazy.function(act_move_up)), - Key([mod], "m", lazy.layout.grow()), - Key([mod], "n", lazy.layout.shrink()), - Key([mod, 'shift'], "m", lazy.layout.maximize()), - Key([mod, 'shift'], "n", lazy.layout.normalize()), - - - Key([], 'F12', lazy.function(act_F12)), - # Key([], 'PrintScreen', lazy.spawn('spectacle')), - - - Key([mod], 't', lazy.function(act_enable_touchpad)), - Key([mod, 'shift'], 't', lazy.function(act_disable_touchpad)), - ], - - - [Key([mod], group.name, - lazy.function(functools.partial(act_focus_group, group))) - for group in groups if group.name != 'term'], - - [Key([mod, 'shift'], group.name, - lazy.function(functools.partial(act_move_to_group, group))) - for group in groups if group.name != 'term'], - -)) - - -@hook.subscribe.current_screen_change -def hook_current_screen_change(): - change_border_focus() - - -@hook.subscribe.setgroup -def hook_setgroup(): - change_border_focus() - - -def change_border_focus(): - qtile = hook.qtile - for i in qtile.screens: - if qtile.current_screen == i: - if isinstance(i.group.layout, layout.MonadTall): - if i.group.layout.border_focus != "#ff0000": - i.group.layout.border_focus = "#ff0000" - i.group.layout_all() - else: - if isinstance(i.group.layout, layout.MonadTall): - if i.group.layout.border_focus != "#000000": - i.group.layout.border_focus = "#000000" - i.group.layout_all() - - -@hook.subscribe.startup -def hook_startup(): - qtile = hook.qtile - screens_set = set() - for g in groups: - if g.screen_affinity is not None and g.screen_affinity not in screens_set: - qtile.groups_map[g.name].cmd_toscreen(g.screen_affinity) - screens_set.add(g.screen_affinity) - with contextlib.suppress(Exception): - subprocess.Popen(['feh', '--bg-scale', - os.path.expanduser('~/.dotfiles/pictures/bg1.jpg'), - os.path.expanduser('~/.dotfiles/pictures/bg2.jpg')]) - - -@hook.subscribe.startup_once -def hook_startup_once(): - #with contextlib.suppress(Exception): - # subprocess.Popen(['dropbox']) - #with contextlib.suppress(Exception): - # subprocess.Popen(['megasync']) - with contextlib.suppress(Exception): - subprocess.Popen(['kuiserver5']) - - -@hook.subscribe.client_new -def float_modal(window): - if 383 in window.window.get_property('_NET_WM_STATE', unpack=int): - window.floating = True diff --git a/sway/.Xresources b/sway/.Xresources deleted file mode 100644 index 1d5c21f..0000000 --- a/sway/.Xresources +++ /dev/null @@ -1,3 +0,0 @@ -Xcursor.theme: Neutral -Xcursor.size: 32 -Xft.dpi: 120 diff --git a/sway/config b/sway/config deleted file mode 100644 index 16fdd9e..0000000 --- a/sway/config +++ /dev/null @@ -1,126 +0,0 @@ - -set $mod Mod4 -set $ws1 "1:1" -set $ws2 "2:2" -set $ws3 "3:3" -set $ws4 "4:4" -set $wsa "5:a" -set $wss "6:s" -set $wsd "7:d" -set $wsf "8:f" - -floating_modifier $mod -font pango:Droid Sans 11 -default_border normal 3 - -workspace $ws1 output eDP-1 -workspace $ws2 output eDP-1 -workspace $ws3 output eDP-1 -workspace $ws4 output eDP-1 -workspace $wsa output DP-6 -workspace $wss output DP-6 -workspace $wsd output DP-6 -workspace $wsf output DP-6 - -output eDP-1 { - position 0 0 - background ~/.dotfiles/pictures/bg1.jpg fill -} - -output DP-6 { - position 1920 0 - background ~/.dotfiles/pictures/bg2.jpg fill -} - -bindsym $mod+Return exec alacritty -bindsym $mod+space exec --no-startup-id wofi --show drun --allow-images -bindsym $mod+backslash split h -bindsym $mod+minus split v -#bindsym $mod+s layout stacking -#bindsym $mod+w layout tabbed -bindsym $mod+Tab layout toggle split -bindsym $mod+p focus parent -#bindsym $mod+d focus child -bindsym $mod+r mode "resize" - -bindsym $mod+Shift+r restart -bindsym $mod+Shift+e exit -bindsym $mod+Shift+q kill -bindsym $mod+Shift+space floating toggle -bindsym $mod+Shift+Return fullscreen toggle - - -bindsym $mod+h focus left -bindsym $mod+j focus down -bindsym $mod+k focus up -bindsym $mod+l focus right - -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -bindsym $mod+Shift+h move left -bindsym $mod+Shift+j move down -bindsym $mod+Shift+k move up -bindsym $mod+Shift+l move right - -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - - -bindsym $mod+1 workspace $ws1 -bindsym $mod+2 workspace $ws2 -bindsym $mod+3 workspace $ws3 -bindsym $mod+4 workspace $ws4 -bindsym $mod+a workspace $wsa -bindsym $mod+s workspace $wss -bindsym $mod+d workspace $wsd -bindsym $mod+f workspace $wsf - -bindsym $mod+Shift+1 move container to workspace $ws1 -bindsym $mod+Shift+2 move container to workspace $ws2 -bindsym $mod+Shift+3 move container to workspace $ws3 -bindsym $mod+Shift+4 move container to workspace $ws4 -bindsym $mod+Shift+a move container to workspace $wsa -bindsym $mod+Shift+s move container to workspace $wss -bindsym $mod+Shift+d move container to workspace $wsd -bindsym $mod+Shift+f move container to workspace $wsf - - -mode "resize" { - bindsym h resize shrink width 10 px or 10 ppt - bindsym j resize grow height 10 px or 10 ppt - bindsym k resize shrink height 10 px or 10 ppt - bindsym l resize grow width 10 px or 10 ppt - - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" -} - - -bar { - status_command py3status - tray_output primary - strip_workspace_numbers yes - font pango:Font Awesome 5 Free, Font Awesome 5 Brands, Droid Sans Mono 12 -} - - -exec xrdb -load ~/.config/sway/.Xresources - - -# terminal -for_window [app_id="scratchpad_term"] \ - move scratchpad, \ - border none, \ - exec --no-startup-id ~/.dotfiles/terminal.sh -bindsym F12 exec --no-startup-id ~/.dotfiles/terminal.sh diff --git a/sxhkd/sxhkdrc.i3 b/sxhkd/sxhkdrc.i3 deleted file mode 100644 index ec9af48..0000000 --- a/sxhkd/sxhkdrc.i3 +++ /dev/null @@ -1,46 +0,0 @@ -F12 - python ~/.config/sxhkd/terminal_i3.py - -mod4 + Return - alacritty -mod4 + space - rofi -show drun -mod4 + backslash - i3-msg "split h" -mod4 + minus - i3-msg "split v" -mod4 + Tab - i3-msg "layout toggle split" -mod4 + p - i3-msg "focus parent" -mod4 + r - i3-msg "mode resize" - -mod4 + shift + r - i3-msg "restart" -mod4 + shift + e - i3-msg "exit" -mod4 + shift + q - i3-msg "kill" -mod4 + shift + space - i3-msg "floating toggle" -mod4 + shift + Return - i3-msg "fullscreen toggle" - -mod4 + {h, Left} - i3-msg "focus left" -mod4 + {j, Down} - i3-msg "focus down" -mod4 + {k, Up} - i3-msg "focus up" -mod4 + {l, Right} - i3-msg "focus right" - -mod4 + shift + {h, Left} - i3-msg "move left" -mod4 + shift + {j, Down} - i3-msg "move down" -mod4 + shift + {k, Up} - i3-msg "move up" -mod4 + shift + {l, Right} - i3-msg "move right" diff --git a/sxhkd/terminal_i3.py b/sxhkd/terminal_i3.py deleted file mode 100644 index c53ff53..0000000 --- a/sxhkd/terminal_i3.py +++ /dev/null @@ -1,58 +0,0 @@ -import json -import subprocess - - -def send_msg(msg_type, msg): - p = subprocess.run(['i3-msg', '-t', msg_type, msg], - capture_output=True, - check=True) - return json.loads(p.stdout.decode('utf-8')) - - -def is_term_running(): - - def node_exists(node): - if node.get('window_properties', {}).get('instance') == 'scratchpad_term': - return True - return any(node_exists(i) for i in node.get('nodes', [])) - - tree = send_msg('get_tree', '') - return node_exists(tree) - - -def run_term(): - subprocess.Popen([ - 'alacritty', '--class', 'scratchpad_term', - '-e', 'tmux', 'new-session', '-A', '-s', 'default']) - - -def get_focused_workspace(): - workspaces = send_msg('get_workspaces', '') - for workspace in workspaces: - if workspace['focused']: - return workspace['name'] - - -def get_focused_output(focused_workspace): - outputs = send_msg('get_outputs', '') - for out in outputs: - if out['current_workspace'] == focused_workspace: - return out['name'] - - -def main(): - focused_workspace = get_focused_workspace() - if focused_workspace == '9:term': - send_msg('command', 'workspace back_and_forth') - else: - focused_output = get_focused_output(focused_workspace) - if not is_term_running(): - run_term() - send_msg('command', '[instance="scratchpad_term"] ' - 'move container to workspace "9:term"') - send_msg('command', 'workspace "9:term"') - send_msg('command', f'move workspace to output {focused_output}') - - -if __name__ == '__main__': - main() @@ -30,17 +30,14 @@ Plug 'kien/ctrlp.vim' Plug 'airblade/vim-gitgutter' Plug 'majutsushi/tagbar' Plug 'xolox/vim-misc' -"Plug 'xolox/vim-easytags' Plug 'w0rp/ale' -Plug 'Valloric/YouCompleteMe' Plug 'thaerkh/vim-indentguides' Plug 'vim-scripts/paredit.vim' Plug 'christoomey/vim-tmux-navigator' Plug 'ryanoasis/vim-devicons' Plug 'Xuyuanp/nerdtree-git-plugin' +Plug 'mg979/vim-visual-multi' -"Plug 'dleonard0/pony-vim-syntax' -"Plug 'terryma/vim-multiple-cursors' "Plug 'tpope/vim-fugitive.git' "Plug 'severin-lemaignan/vim-minimap' call plug#end() @@ -136,11 +133,13 @@ nnoremap <Leader>zz :let &scrolloff=999-&scrolloff<CR> set mouse=a " ale configuration -let g:ale_linters = {'python': ['flake8']} +let g:ale_linters = { +\ 'python': ['flake8'] +\} " YouCompleteMe configuration -let g:ycm_auto_trigger = 0 -let g:ycm_show_diagnostics_ui = 0 +"let g:ycm_auto_trigger = 0 +"let g:ycm_show_diagnostics_ui = 0 " completion options set completeopt=menuone diff --git a/waybar/config b/waybar/config deleted file mode 100644 index b98d6dd..0000000 --- a/waybar/config +++ /dev/null @@ -1,24 +0,0 @@ -{ - "layer": "top", - "position": "bottom", - "gtk-layer-shell": false, - "modules-left": ["sway/workspaces", "sway/mode"], - "modules-right": ["tray", "network", "battery", "pulseaudio", "clock"], - "network": { - "on-click": "connman-gtk", - "tooltip": false - }, - "battery": { - "format": "{capacity}% {icon}", - "format-icons": ["", "", "", "", ""], - "tooltip": false - }, - "pulseaudio": { - "on-click": "pavucontrol", - "tooltip": false - }, - "clock": { - "format": "{:%Y-%m-%d %H:%M}", - "tooltip": false - } -} diff --git a/xonsh/.xonshrc b/xonsh/.xonshrc deleted file mode 100644 index 5d3683d..0000000 --- a/xonsh/.xonshrc +++ /dev/null @@ -1,3 +0,0 @@ -$XONSH_COLOR_STYLE = 'monokai' -$PROMPT = "[{BOLD_GREEN}{user}@{hostname} {BOLD_CYAN}{cwd}{branch_color}{curr_branch: {}}{NO_COLOR}]{BOLD_CYAN}{prompt_end} {NO_COLOR}" -$SUPPRESS_BRANCH_TIMEOUT_MESSAGE = True diff --git a/xorg/.xsession b/xorg/.xsession index 02b0e52..806262b 100755 --- a/xorg/.xsession +++ b/xorg/.xsession @@ -1,12 +1,14 @@ #!/bin/bash +xrandr +xrdb -merge ~/.Xresources xset -b autorandr --change [[ -n $(xrandr | grep "connected 3840x2160") ]] && xrandr --dpi 120 [[ -n $(xrandr | grep "connected 3840x2160") ]] && echo "Xft.dpi: 120" | xrdb -override -feh --bg-scale ~/.dotfiles/pictures/bg1.jpg \ - ~/.dotfiles/pictures/bg2.jpg +feh --bg-scale ~/.pictures/bg1.jpg \ + ~/.pictures/bg2.jpg picom & #gajim & diff --git a/yabar/yabar.conf b/yabar/yabar.conf deleted file mode 100644 index 634acdc..0000000 --- a/yabar/yabar.conf +++ /dev/null @@ -1,34 +0,0 @@ -bar-list: ["base"]; - -base: { - monitor: ""; - position: "top"; - height: 40; - font: "Droid Sans, FontAwesome Bold 10"; - - block-list: ["workspace", "title"]; - workspace: { - exec: "YABAR_WORKSPACE"; - align: "left"; - fixed-size: 40; - } - title: { - exec: "YABAR_TITLE"; - align: "left"; - justify: "left"; - fixed-size: 300; - } - -} - - -bar1: { - inherit-all: "base"; - monitor: "eDP1"; -} - - -bar2: { - inherit-all: "base"; - monitor: "DP1-2"; -} |