Merge remote-tracking branch 'origin/master'

simpleDots/bin/fzpass

@@ -29,14 +29,14 @@ export -f fzpass_update
 password=$( printf '%s\n' "${password_files[@]}" \
             | fzf --bind='ctrl-s:toggle-preview' \
                   --bind='ctrl-u:execute(fzpass_update)' \
-			      --bind='ctrl-delete:execute(pass rm {})' \
+			      --bind='ctrl-r:execute(pass rm {})' \
 			      --bind='ctrl-e:execute(pass edit {} < /dev/tty > /dev/tty)' \
                   --preview='pass show {}' \
                   --preview-window="hidden" \
                   --no-mouse \
 				  --header='
 Ret: Copy pass, show OTP; C-s: Show entry; C-e: Edit entry
-C-u: Update (pull, push); C-DEL: Delete'
+C-u: Update (pull, push); C-r: Remove'
                   $@ \
 		  )
 

simpleDots/vim/vimrc

@@ -121,15 +121,15 @@ nmap <leader>lr :set relativenumber!<cr>
 nmap <leader>cc :set cursorcolumn!<cr>
 nmap <leader>cl :set cursorline!<cr>
 
-" Better split switching
+" Better split switching with alt
-map <C-j> <C-W>j
+map <M-j> <C-W>j
-map <C-k> <C-W>k
+map <M-k> <C-W>k
-map <C-h> <C-W>h
+map <M-h> <C-W>h
-map <C-l> <C-W>l
+map <M-l> <C-W>l
-map <C-down> <C-W>j
+map <M-down> <C-W>j
-map <C-up> <C-W>k
+map <M-up> <C-W>k
-map <C-left> <C-W>h
+map <M-left> <C-W>h
-map <C-right> <C-W>l
+map <M-right> <C-W>l
 
 " Move up and down on split lines
 map <Up> gk
@@ -153,6 +153,7 @@ map q: :q
 
 " Paste Mode
 set pastetoggle=<F2>
+nmap p :pu<CR>
 
 " ==================== File Type settings ====================
 set tabstop=4
@@ -308,6 +309,7 @@ let g:ctrlp_status_func = {
 " ==================== PLUGIN: NerdTree ====================
 " For toggling
 nmap <C-n> :NERDTreeToggle<CR>
+nmap <F7> :NERDTreeToggle<CR>
 noremap <Leader>n :NERDTreeToggle<cr>
 noremap <Leader>f :NERDTreeFind<cr>
 

tatus

@@ -1,160 +0,0 @@
-diff --git a/configDots/pikaur.conf b/configDots/pikaur.conf
-index 53926ca..73635c2 100644
---- a/configDots/pikaur.conf
-+++ b/configDots/pikaur.conf
-@@ -9,10 +9,10 @@ ignoreoutofdateaurupgrades = no
- keepbuilddir = no
- keepdevbuilddir = yes
- skipfailedbuild = no
--alwaysusedynamicusers = no
- keepbuilddeps = no
- ignorearch = no
- gpgdir = 
-+dynamicusers = root
- 
- [colors]
- version = 10
-diff --git a/simpleDots/i3/alternating_layouts.py b/simpleDots/i3/alternating_layouts.py
-deleted file mode 100755
-index d38d2ca..0000000
---- a/simpleDots/i3/alternating_layouts.py
-+++ /dev/null
-@@ -1,106 +0,0 @@
--#!/usr/bin/env python
--
--import i3
--import re
--import subprocess
--import getopt
--import sys
--import os
--
--
--def find_parent(window_id):
--    """
--        Find the parent of a given window id
--    """
--    root_window = i3.get_tree()
--    result = [None]
--
--    def finder(n, p=None):
--        if result[0] is not None:
--            return
--        for node in n:
--            if node['id'] == window_id:
--                result[0] = p
--                return
--            if len(node['nodes']):
--                finder(node['nodes'], node)
--
--    finder(root_window['nodes'])
--    return result[0]
--
--
--def set_layout():
--    """
--        Set the layout/split for the currently
--        focused window to either vertical or
--        horizontal, depending on its width/height
--    """
--    current_win = i3.filter(nodes=[], focused=True)
--    for win in current_win:
--        parent = find_parent(win['id'])
--
--        if (parent and "rect" in parent
--                   and parent['layout'] != 'tabbed'
--                   and parent['layout'] != 'stacked'):
--            height = parent['rect']['height']
--            width = parent['rect']['width']
--
--            if height > width:
--                new_layout = 'vertical'
--            else:
--                new_layout = 'horizontal'
--
--            i3.split(new_layout)
--
--
--def print_help():
--    print("Usage: " + sys.argv[0] + " [-p path/to/pid.file]")
--    print("")
--    print("Options:")
--    print("    -p path/to/pid.file   Saves the PID for this program in the filename specified")
--    print("")
--
--
--def main():
--    """
--        Main function - listen for window focus
--        changes and call set_layout when focus
--        changes
--    """
--    opt_list, args = getopt.getopt(sys.argv[1:], 'hp:')
--    pid_file = None
--    for opt in opt_list:
--        if opt[0] == "-h":
--            print_help()
--            sys.exit()
--        if opt[0] == "-p":
--            pid_file = opt[1]
--
--    if pid_file:
--        with open(pid_file, 'w') as f:
--            f.write(str(os.getpid()))
--
--
--    process = subprocess.Popen(
--        ['xprop', '-root', '-spy'],
--        stdout=subprocess.PIPE,
--        stderr=subprocess.PIPE
--    )
--    regex = re.compile(b'^_NET_CLIENT_LIST_STACKING|^_NET_ACTIVE_WINDOW')
--
--    last_line = ""
--    while True:
--        line = process.stdout.readline()
--        if line == b'': #X is dead
--            break
--        if line == last_line:
--            continue
--        if regex.match(line):
--            set_layout()
--        last_line = line
--
--    process.kill()
--    sys.exit()
--
--if __name__ == "__main__":
--    main()
-diff --git a/simpleDots/i3/config b/simpleDots/i3/config
-index 3897e90..aff8891 100644
---- a/simpleDots/i3/config
-+++ b/simpleDots/i3/config
-@@ -266,9 +266,10 @@ exec --no-startup-id test -x ~/.local/bin/i3autostart.sh && ~/.local/bin/i3autos
- exec --no-startup-id gsettings set org.gtk.Settings.FileChooser sort-directories-first true
- 
- ## Spirallayout for new windows
--exec_always --no-startup-id ~/.i3/alternating_layouts.py
-+exec_always --no-startup-id /usr/bin/autotiling
- 
- ## Window Config
-+for_window [class="smplayer"] floating enable
- for_window [class="Argon"] floating enable
- for_window [class="Vlc"] floating enable
- for_window [class="Ghidra"] floating enable
-diff --git a/sysconfig_arch/workstation_aurSoftware.yaml b/sysconfig_arch/workstation_aurSoftware.yaml
-index 24e594a..d1ef992 100644
---- a/sysconfig_arch/workstation_aurSoftware.yaml
-+++ b/sysconfig_arch/workstation_aurSoftware.yaml
-@@ -9,10 +9,10 @@
-     become_user: aur_builder
-     aur:
-       name:
-+        - autotiling
-         - free42
-         - insync
-         - c-lolcat
--        - python-i3-py
-         - ttf-unifont
-         - ttf-symbola
-