9 files changed, 57 insertions(+), 53 deletions(-)

M bash/.bash_aliases
M bash/.bashrc
M river/.config/river/autorun
M river/.config/river/init
A sh/.local/bin/faster
M sh/.local/bin/launcher
M sh/.profile
M vis/.config/vis/visrc.lua
M xdg/.config/mimeapps.list

@@ 17,14 17,6 @@ alias ll='ls -AlhvLG --time-style='+' --group-directories-first --color=auto'
 alias lll='ls -ahnv --group-directories-first --color=auto'
 alias grep='grep --color=auto'
 
-if type -fP rmtrash &> /dev/null; then
-    alias rm='rmtrash -v'
-fi
-
-if type -fP docker &> /dev/null; then
-    alias dps="docker ps --format \"table {{.Names}}\t{{.Image}}\t{{.Status}}\""
-fi
-
 if type -fP git &> /dev/null; then
     alias gs='git status'
     alias gd='git diff'

@@ 23,5 23,3 @@ HISTFILESIZE=
 
 [ $UID -eq 0 ] && PS1='# ' || PS1='$ '
 export PS1
-
-export GPG_TTY=$(tty)

@@ 1,3 1,4 @@
+foot --server
 waybar
 gammastep
 mako


@@ 6,3 7,4 @@ blueman-applet
 udiskie --automount --notify --tray
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 1password --silent
+rivertile -main-ratio 0.5 -view-padding 8 -outer-padding 8

@@ 34,26 34,24 @@ for i in $(seq 1 9); do
     riverctl map normal $mod+Shift+Control $i toggle-view-tags $tags
 done
 
-for mode in normal locked; do
-	riverctl map $mode None XF86AudioRaiseVolume spawn \
-		'pulsemixer --unmute --change-volume +5'
-	riverctl map $mode None XF86AudioLowerVolume spawn \
-		'pulsemixer --unmute --change-volume -5'
-	riverctl map $mode None XF86AudioMute spawn \
-		'pulsemixer --toggle-mute'
-	riverctl map $mode None XF86MonBrightnessUp spawn \
-		'brightnessctl s +5%'
-	riverctl map $mode None XF86MonBrightnessDown spawn \
-		'brightnessctl s 5%-'
-	riverctl map $mode None Print spawn \
-		'screenshot'
-	riverctl map $mode Shift Print spawn \
-		'screenshot region'
-	riverctl map $mode $mod N spawn \
-		'makoctl dismiss --all'
-	riverctl map $mode $mod+Shift N spawn \
-		'makoctl restore'
-done
+riverctl map normal None XF86AudioRaiseVolume spawn \
+	'pulsemixer --unmute --change-volume +5'
+riverctl map normal None XF86AudioLowerVolume spawn \
+	'pulsemixer --unmute --change-volume -5'
+riverctl map normal None XF86AudioMute spawn \
+	'pulsemixer --toggle-mute'
+riverctl map normal None XF86MonBrightnessUp spawn \
+	'brightnessctl s +5%'
+riverctl map normal None XF86MonBrightnessDown spawn \
+	'brightnessctl s 5%-'
+riverctl map normal None Print spawn \
+	'screenshot'
+riverctl map normal Shift Print spawn \
+	'screenshot region'
+riverctl map normal $mod N spawn \
+	'makoctl dismiss --all'
+riverctl map normal $mod+Shift N spawn \
+	'makoctl restore'
 
 riverctl set-repeat 50 200
 


@@ 67,11 65,8 @@ riverctl border-width 4
 riverctl border-color-focused 0x93a1a1
 riverctl border-color-unfocused 0x325b68
 
+riverctl default-layout rivertile
+
 while read -r cmd; do
 	pgrep -f "${cmd%% *}" >/dev/null || riverctl spawn "$cmd"
 done < "$XDG_CONFIG_HOME/river/autorun"
-
-riverctl default-layout rivertile
-if ! pgrep rivertile >/dev/null; then
-	exec rivertile -main-ratio 0.5 -view-padding 8 -outer-padding 8
-fi

@@ 0,0 1,3 @@
+#!/bin/sh
+
+pacman -Qq | grep '\-git$' | yay -Syu --removemake --nocleanmenu --nodiffmenu -

@@ 1,3 1,3 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 { IFS=:; ls -H $PATH; } | sort -u | menu | $SHELL

@@ 2,7 2,7 @@
 
 export EDITOR='vis'
 export BROWSER='firefox'
-export TERMINAL='foot'
+export TERMINAL='footclient'
 export READER='zathura'
 
 ## __  ______   ____

@@ 1,6 1,7 @@
 require('vis')
 require('plugins/cscope')
 require('plugins/open_rej')
+require("plugins/vis-filetype-settings")
 require('plugins/vis-smart-backspace')
 require('plugins/vis-surround')
 


@@ 34,18 35,30 @@ end)
 vis.events.subscribe(vis.events.WIN_OPEN, function(win)
 	vis:command('set relativenumbers')
 	vis:command('set cursorline')
-
-	if win.syntax == 'c' or win.syntax == 'bash' then
-		vis:command('set colorcolumn 80')
-	elseif win.syntax == 'python' then
-		vis:command('set tabwidth 4')
-		vis:command('set expandtab')
-		vis:command('set colorcolumn 80')
-	elseif win.syntax == 'zig' then
-		vis:command('set tabwidth 4')
-		vis:command('set expandtab')
-	elseif win.syntax == 'html' then
-		vis:command('set tabwidth 2')
-		vis:command('set expandtab')
-	end
 end)
+
+settings = {
+	bash = {
+		'set colorcolumn 80',
+	},
+	c = {
+		'set colorcolumn 80',
+	},
+	html = {
+		'set tabwidth 2',
+		'set expandtab',
+	},
+	python = {
+		'set colorcolumn 80',
+		'set tabwidth 4',
+		'set expandtab',
+	},
+	rust = {
+		'set tabwidth 4',
+		'set expandtab',
+	},
+	zig = {
+		'set tabwidth 4',
+		'set expandtab',
+	},
+}

@@ 1,12 1,13 @@
 [Default Applications]
-application/gzip=zip.desktop
+application/epub+zip=org.pwmt.zathura.desktop;
+application/gzip=zip.desktop;
 application/pdf=org.pwmt.zathura.desktop;
 application/x-bittorent=torrent.desktop;
 application/zip=zip.desktop
-image/vnd.djvu=org.pwmt.zathura.desktop;
 image/gif=imv.desktop;
 image/jpeg=imv.desktop;
 image/png=imv.desktop;
+image/vnd.djvu=org.pwmt.zathura.desktop;
 inode/directory=filemanager.desktop;
 text/html=firefox.desktop;
 text/plain=text.desktop;