updates
This commit is contained in:
parent
7597b15280
commit
b262308081
9 changed files with 43 additions and 18 deletions
|
@ -35,4 +35,8 @@ unset EXTRAFILE
|
||||||
|
|
||||||
export DOTFILES_DIR DOTFILES_EXTRA_DIR
|
export DOTFILES_DIR DOTFILES_EXTRA_DIR
|
||||||
|
|
||||||
[ -f ~/.welcome ] && [ ! is-tty ] && clear && cat ~/.welcome
|
# welcome art
|
||||||
|
clear
|
||||||
|
! is-tty && [ -f ~/.welcome ] && cat ~/.welcome
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -31,17 +31,24 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
|
||||||
unset f
|
unset f
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
[ -f ~/.xprofile ] && . ~/.xprofile
|
[ -f ~/.xprofile ] && . ~/.xprofile
|
||||||
|
|
||||||
eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
|
eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
|
||||||
export SSH_AUTH_SOCK
|
export SSH_AUTH_SOCK
|
||||||
|
|
||||||
|
not_leftwm() {
|
||||||
|
unclutter --timeout 1 &
|
||||||
|
autorandr -c &
|
||||||
|
}
|
||||||
|
|
||||||
# $1 is xterm
|
# $1 is xterm
|
||||||
# $2 is the wm arg passed to startx
|
# $2 is the wm arg passed to startx
|
||||||
# i.e. startx plasma
|
# i.e. startx qtile
|
||||||
|
|
||||||
case $2 in
|
case $2 in
|
||||||
leftwm)
|
leftwm)
|
||||||
|
export DESKTOP_SESSION=leftwm
|
||||||
exec leftwm
|
exec leftwm
|
||||||
;;
|
;;
|
||||||
plasma)
|
plasma)
|
||||||
|
@ -49,10 +56,17 @@ case $2 in
|
||||||
exec startplasma-x11
|
exec startplasma-x11
|
||||||
;;
|
;;
|
||||||
xmonad)
|
xmonad)
|
||||||
|
export DESKTOP_SESSION=xmonad
|
||||||
xmonad
|
xmonad
|
||||||
;;
|
;;
|
||||||
|
qtile)
|
||||||
|
not_leftwm
|
||||||
|
export DESKTOP_SESSION=qtile
|
||||||
|
exec qtile start
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
exec leftwm
|
not_leftwm
|
||||||
|
export DESKTOP_SESSION=qtile
|
||||||
|
exec qtile start
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# enable touch on only laptop monitor
|
# enable touch on only laptop monitor
|
||||||
xinput --map-to-output 'ELAN901C:00 04F3:2C29' eDP1
|
xinput --map-to-output 'ELAN901C:00 04F3:2C29' eDP-1
|
||||||
|
|
||||||
xrandr --newmode "1920x1080_60.00" 173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync
|
|
||||||
xrandr --addmode eDP1 "1920x1080_60.00"
|
|
||||||
|
|
||||||
xss-lock -- ~/bin/lock &
|
xss-lock -- ~/bin/lock &
|
||||||
|
|
||||||
xsetroot -cursor_name left_ptr
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ window:
|
||||||
#position:
|
#position:
|
||||||
# x: 0
|
# x: 0
|
||||||
# y: 0
|
# y: 0
|
||||||
opacity: .90
|
opacity: .80
|
||||||
# Window padding (changes require restart)
|
# Window padding (changes require restart)
|
||||||
#
|
#
|
||||||
# Blank space added around the window in pixels. This padding is scaled
|
# Blank space added around the window in pixels. This padding is scaled
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
sleep 1
|
# sleep 1
|
||||||
leftwm-command "SoftReload"
|
# if [[ $DESKTOP_SESSION=="leftwm" ]]; then
|
||||||
|
# leftwm-command "SoftReload"
|
||||||
|
# elif [[ $DESTOP_SESSION=="qtile"]]; then
|
||||||
|
# qtile cmd-obj -o cmd -f restart
|
||||||
|
# fi
|
||||||
|
|
|
@ -8,6 +8,9 @@ disable_current_tag_swap = false
|
||||||
focus_behaviour = "Sloppy"
|
focus_behaviour = "Sloppy"
|
||||||
focus_new_windows = true
|
focus_new_windows = true
|
||||||
|
|
||||||
|
window_rules = [
|
||||||
|
{window_class = "wavebox", spawn_on_tag = 8}
|
||||||
|
]
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# Program Specific Settings
|
# Program Specific Settings
|
||||||
|
@ -75,10 +78,10 @@ name = "Alacritty" # This is the name which is referenced when calling (case-se
|
||||||
value = "alacritty" # The command to load the application if it isn't started
|
value = "alacritty" # The command to load the application if it isn't started
|
||||||
# x, y, width, height are in pixels when an integer is inputted or a percentage when a float is inputted.
|
# x, y, width, height are in pixels when an integer is inputted or a percentage when a float is inputted.
|
||||||
# These values are relative to the size of the workspace, and will be restricted depending on the workspace size.
|
# These values are relative to the size of the workspace, and will be restricted depending on the workspace size.
|
||||||
x = 0.25
|
x = 0.1
|
||||||
y = 0.25
|
y = 0.1
|
||||||
height = 0.5
|
height = 0.8
|
||||||
width = 0.5
|
width = 0.8
|
||||||
|
|
||||||
[[keybind]]
|
[[keybind]]
|
||||||
command = "ToggleScratchPad"
|
command = "ToggleScratchPad"
|
||||||
|
|
|
@ -79,7 +79,7 @@ recursion:
|
||||||
enabled: false
|
enabled: false
|
||||||
# How deep the recursion should go. This has to be a positive integer. Leave
|
# How deep the recursion should go. This has to be a positive integer. Leave
|
||||||
# it unspecified for (virtually) infinite.
|
# it unspecified for (virtually) infinite.
|
||||||
depth: 2
|
# depth: 2
|
||||||
|
|
||||||
# == Size ==
|
# == Size ==
|
||||||
# Specifies the format of the size column.
|
# Specifies the format of the size column.
|
||||||
|
|
|
@ -14,7 +14,8 @@ lvim.builtin.nvimtree.show_icons.git = 0
|
||||||
-- if you don't want all the parsers change this to a table of the ones you want
|
-- if you don't want all the parsers change this to a table of the ones you want
|
||||||
lvim.builtin.treesitter.ensure_installed = {
|
lvim.builtin.treesitter.ensure_installed = {
|
||||||
"bash",
|
"bash",
|
||||||
-- "javascript",
|
"haskell",
|
||||||
|
"javascript",
|
||||||
"json",
|
"json",
|
||||||
"lua",
|
"lua",
|
||||||
"python",
|
"python",
|
||||||
|
|
|
@ -14,6 +14,9 @@ map('v','jk','<Esc>',{noremap=true})
|
||||||
map('n', "H", "^",{noremap=true})
|
map('n', "H", "^",{noremap=true})
|
||||||
map('n', "L", "$",{noremap=true})
|
map('n', "L", "$",{noremap=true})
|
||||||
|
|
||||||
|
map('n','j',"v:count ? 'j' : 'gj'",{expr=true,noremap=true})
|
||||||
|
map('n','k',"v:count ? 'k' : 'gk'",{expr=true,noremap=true})
|
||||||
|
|
||||||
-- zettelkasten keybindings
|
-- zettelkasten keybindings
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue