update prep
This commit is contained in:
@@ -10,7 +10,8 @@
|
||||
# fi
|
||||
|
||||
if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
|
||||
XKB_DEFAULT_LAYOUT=us exec sway
|
||||
exec sway
|
||||
#exec sway -d 2> ~/sway.log
|
||||
fi
|
||||
|
||||
# if [[ -z $DISPLAY && $(tty) == /dev/tty1 && $XDG_SESSION_TYPE == tty ]]; then
|
||||
|
||||
5
.bashrc
5
.bashrc
@@ -75,7 +75,7 @@ source /usr/share/fzf/key-bindings.bash
|
||||
source /usr/share/fzf/completion.bash
|
||||
|
||||
#use ripgrep with fzf
|
||||
export FZF_DEFAULT_COMMAND='rg -i --files --glob "!.git/*"'
|
||||
#export FZF_DEFAULT_COMMAND='rg -i --files --glob "!.git/*"'
|
||||
#export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"'
|
||||
|
||||
#bat instead of cat
|
||||
@@ -93,6 +93,8 @@ export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
|
||||
#bind ctrl-p to text editor
|
||||
alias fzfcmd='fzf --bind "enter:execute($EDITOR {})"'
|
||||
bind -x '"\C-p": fzfcmd;'
|
||||
#---end fzf setup---
|
||||
|
||||
|
||||
#setup bash history
|
||||
export HISTIGNORE="ls*:cd*:exit:ps*:history:pass*:gpg*:start*"
|
||||
@@ -105,6 +107,7 @@ export HISTCONTROL=ignoreboth:erasedups
|
||||
shopt -s histappend
|
||||
# export HISTTIMEFORMAT='%Y-%m-%d %H:%M:%S | '
|
||||
|
||||
#
|
||||
# if [ -d "$HOME/bin/Fiji.app" ]; then
|
||||
# alias fiji="~/bin/Fiji.app/ImageJ-linux64"
|
||||
# fi
|
||||
|
||||
@@ -18,12 +18,13 @@ set $alt Mod1
|
||||
# Your preferred terminal emulator
|
||||
# set $term urxvt
|
||||
set $term alacritty
|
||||
#
|
||||
# set $term foot
|
||||
|
||||
# Your preferred application launcher
|
||||
# set $menu dmenu_run
|
||||
# set $menu bemenu-run
|
||||
# Note: it's recommended that you pass the final command to sway
|
||||
set $menu dmenu_path | dmenu | xargs swaymsg exec --
|
||||
#set $menu dmenu_path | dmenu | xargs swaymsg exec --
|
||||
set $menu dmenu_path | wmenu | xargs swaymsg exec --
|
||||
bindsym $mod+d exec $menu
|
||||
|
||||
bindsym --release $mod+z exec 'fn=$(date "+%Y-%m-%d-%H%M%S").png; grim -g "$(slurp)" $fn; ~/bin/mv2figs.sh $fn'
|
||||
# bindsym --release $mod+z exec scrot '%Y-%m-%d_%H%M%S_$wx$h.png' -e '~/bin/mv2figs.sh $f'
|
||||
@@ -41,6 +42,7 @@ bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
|
||||
#bindsym XF86AudioRaiseVolume exec amixer -q set Master 2dB+ unmute
|
||||
#bindsym XF86AudioRaiseVolume exec amixer -q set Master 2dB+ unmute
|
||||
#bindsym XF86AudioMute exec amixer -q set Master toggle
|
||||
|
||||
#display brightness
|
||||
#bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
|
||||
#bindsym XF86MonBrightnessUp exec brightnessctl set +5%
|
||||
@@ -51,16 +53,24 @@ font pango:monospace 8
|
||||
|
||||
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
|
||||
# output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
|
||||
# output * bg #000000 solid_color
|
||||
|
||||
#Apple trackpad input device id:
|
||||
input "1452:657:bcm5974" {
|
||||
tap enabled
|
||||
}
|
||||
|
||||
#typematic delay and rate
|
||||
input type:keyboard {
|
||||
xkb_layout us
|
||||
repeat_delay 600
|
||||
repeat_rate 60
|
||||
}
|
||||
|
||||
# You can get the names of your inputs by running: swaymsg -t get_inputs
|
||||
# Read `man 5 sway-input` for more information about this section.
|
||||
|
||||
#output eDP-1 resolution 1440x900 position 1440,0
|
||||
# output eDP-1 resolution 1440x900 position 1440,0
|
||||
#
|
||||
# Example configuration:
|
||||
#
|
||||
@@ -69,8 +79,8 @@ input "1452:657:bcm5974" {
|
||||
# You can get the names of your outputs by running: swaymsg -t get_outputs
|
||||
#
|
||||
#HiDPI displays
|
||||
#output <name> scale <factor>
|
||||
#output eDP-1 scale 2
|
||||
# output <name> scale <factor>
|
||||
# output eDP-1 scale 2
|
||||
|
||||
# Use Mouse+$mod to drag floating windows to their wanted position
|
||||
floating_modifier $mod
|
||||
@@ -81,18 +91,10 @@ bindsym $mod+Return exec $term
|
||||
# kill focused window
|
||||
bindsym $mod+Shift+q kill
|
||||
|
||||
# start dmenu (a program launcher)
|
||||
bindsym $mod+d exec $menu
|
||||
# There also is the (new) i3-dmenu-desktop which only displays applications
|
||||
# shipping a .desktop file. It is a wrapper around dmenu, so you need that
|
||||
# installed.
|
||||
# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
|
||||
|
||||
## change focus
|
||||
#bindsym $mod+j focus left
|
||||
#bindsym $mod+k focus down
|
||||
#bindsym $mod+l focus up
|
||||
#bindsym $mod+semicolon focus right
|
||||
# bindsym $mod+j focus left
|
||||
# bindsym $mod+k focus down
|
||||
# bindsym $mod+l focus up
|
||||
# bindsym $mod+semicolon focus right
|
||||
bindsym $mod+h focus left
|
||||
bindsym $mod+j focus down
|
||||
bindsym $mod+k focus up
|
||||
@@ -105,10 +107,10 @@ bindsym $mod+Up focus up
|
||||
bindsym $mod+Right focus right
|
||||
|
||||
## move focused window
|
||||
#bindsym $mod+Shift+j move left
|
||||
#bindsym $mod+Shift+k move down
|
||||
#bindsym $mod+Shift+l move up
|
||||
#bindsym $mod+Shift+semicolon move right
|
||||
# bindsym $mod+Shift+j move left
|
||||
# bindsym $mod+Shift+k move down
|
||||
# bindsym $mod+Shift+l move up
|
||||
# bindsym $mod+Shift+semicolon move right
|
||||
bindsym $mod+Shift+h move left
|
||||
bindsym $mod+Shift+j move down
|
||||
bindsym $mod+Shift+k move up
|
||||
@@ -144,9 +146,6 @@ bindsym $mod+space focus mode_toggle
|
||||
# focus the parent container
|
||||
bindsym $mod+a focus parent
|
||||
|
||||
# focus the child container
|
||||
#bindsym $mod+d focus child
|
||||
|
||||
# Define names for default workspaces for which we configure key bindings later on.
|
||||
# We use variables to avoid repeating the names in multiple places.
|
||||
set $ws1 "1"
|
||||
@@ -196,10 +195,10 @@ bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut.
|
||||
mode "resize" {
|
||||
# These bindings trigger as soon as you enter the resize mode
|
||||
|
||||
# Pressing left will shrink the window’s width.
|
||||
# Pressing right will grow the window’s width.
|
||||
# Pressing up will shrink the window’s height.
|
||||
# Pressing down will grow the window’s height.
|
||||
# Pressing left will shrink the window width.
|
||||
# Pressing right will grow the window width.
|
||||
# Pressing up will shrink the window height.
|
||||
# Pressing down will grow the window height.
|
||||
bindsym j resize shrink width 10 px or 10 ppt
|
||||
bindsym k resize grow height 10 px or 10 ppt
|
||||
bindsym l resize shrink height 10 px or 10 ppt
|
||||
@@ -311,6 +310,14 @@ bindsym $mod+Shift+m border pixel 1
|
||||
# focus windows using only keyboard
|
||||
focus_follows_mouse no
|
||||
|
||||
# set cursor theme and size
|
||||
#seat seat0 xcursor_theme Simple-and-soft 24
|
||||
#seat seat0 xcursor_theme Adwaita 12
|
||||
|
||||
#hide mouse cursor. Either after msec of inactivity or whenever typing
|
||||
seat seat0 hide_cursor 2000
|
||||
# seat seat0 hide_cursor when-typing enable
|
||||
|
||||
#Can use the following with custom workspace save files to reload layouts
|
||||
#exec --no-startup-id "i3-msg 'workspace 1; append_layout ~/.config/i3/workspace-1.json'"
|
||||
|
||||
@@ -318,4 +325,4 @@ include /etc/sway/config.d/*
|
||||
# exec xrdb -load ~/.Xresources
|
||||
# exec mako
|
||||
exec dunst
|
||||
exec_always "systemctl --user import-environment; systemctl --user start sway-session.target"
|
||||
#exec_always "systemctl --user import-environment; systemctl --user start sway-session.target"
|
||||
|
||||
Reference in New Issue
Block a user