diff --git a/home/dot_zshrc b/home/dot_zshrc index d03527e..838d45d 100644 --- a/home/dot_zshrc +++ b/home/dot_zshrc @@ -35,4 +35,8 @@ unset EXTRAFILE export DOTFILES_DIR DOTFILES_EXTRA_DIR -[ -f ~/.welcome ] && [ ! is-tty ] && clear && cat ~/.welcome +# welcome art +clear +! is-tty && [ -f ~/.welcome ] && cat ~/.welcome + + diff --git a/home/executable_dot_xinitrc b/home/executable_dot_xinitrc index c83c1e9..5015084 100644 --- a/home/executable_dot_xinitrc +++ b/home/executable_dot_xinitrc @@ -31,17 +31,24 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi + [ -f ~/.xprofile ] && . ~/.xprofile eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) export SSH_AUTH_SOCK +not_leftwm() { + unclutter --timeout 1 & + autorandr -c & +} + # $1 is xterm # $2 is the wm arg passed to startx -# i.e. startx plasma +# i.e. startx qtile case $2 in leftwm) + export DESKTOP_SESSION=leftwm exec leftwm ;; plasma) @@ -49,10 +56,17 @@ case $2 in exec startplasma-x11 ;; xmonad) + export DESKTOP_SESSION=xmonad xmonad ;; + qtile) + not_leftwm + export DESKTOP_SESSION=qtile + exec qtile start + ;; *) - exec leftwm + not_leftwm + export DESKTOP_SESSION=qtile + exec qtile start ;; esac - diff --git a/home/executable_dot_xprofile b/home/executable_dot_xprofile index 1d1c175..92cacfe 100644 --- a/home/executable_dot_xprofile +++ b/home/executable_dot_xprofile @@ -1,11 +1,7 @@ #!/bin/sh # 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 & - -xsetroot -cursor_name left_ptr diff --git a/home/private_dot_config/alacritty/alacritty.yml b/home/private_dot_config/alacritty/alacritty.yml index 8bcb228..b446d3a 100644 --- a/home/private_dot_config/alacritty/alacritty.yml +++ b/home/private_dot_config/alacritty/alacritty.yml @@ -41,7 +41,7 @@ window: #position: # x: 0 # y: 0 - opacity: .90 + opacity: .80 # Window padding (changes require restart) # # Blank space added around the window in pixels. This padding is scaled diff --git a/home/private_dot_config/autorandr/executable_postswitch b/home/private_dot_config/autorandr/executable_postswitch index e4dbebb..f6d8d0a 100644 --- a/home/private_dot_config/autorandr/executable_postswitch +++ b/home/private_dot_config/autorandr/executable_postswitch @@ -1,3 +1,7 @@ #!/usr/bin/env bash -sleep 1 -leftwm-command "SoftReload" +# sleep 1 +# if [[ $DESKTOP_SESSION=="leftwm" ]]; then + # leftwm-command "SoftReload" +# elif [[ $DESTOP_SESSION=="qtile"]]; then + # qtile cmd-obj -o cmd -f restart +# fi diff --git a/home/private_dot_config/leftwm/config.toml b/home/private_dot_config/leftwm/config.toml index 0304e56..0d46ae1 100644 --- a/home/private_dot_config/leftwm/config.toml +++ b/home/private_dot_config/leftwm/config.toml @@ -8,6 +8,9 @@ disable_current_tag_swap = false focus_behaviour = "Sloppy" focus_new_windows = true +window_rules = [ + {window_class = "wavebox", spawn_on_tag = 8} +] ##################################### # 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 # 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. -x = 0.25 -y = 0.25 -height = 0.5 -width = 0.5 +x = 0.1 +y = 0.1 +height = 0.8 +width = 0.8 [[keybind]] command = "ToggleScratchPad" diff --git a/home/private_dot_config/lsd/config.yaml b/home/private_dot_config/lsd/config.yaml index 77c0bca..0dde212 100644 --- a/home/private_dot_config/lsd/config.yaml +++ b/home/private_dot_config/lsd/config.yaml @@ -79,7 +79,7 @@ recursion: enabled: false # How deep the recursion should go. This has to be a positive integer. Leave # it unspecified for (virtually) infinite. - depth: 2 + # depth: 2 # == Size == # Specifies the format of the size column. diff --git a/home/private_dot_config/lvim/config.lua b/home/private_dot_config/lvim/config.lua index a61b341..9a57c53 100644 --- a/home/private_dot_config/lvim/config.lua +++ b/home/private_dot_config/lvim/config.lua @@ -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 lvim.builtin.treesitter.ensure_installed = { "bash", - -- "javascript", + "haskell", + "javascript", "json", "lua", "python", diff --git a/home/private_dot_config/lvim/lua/keybindings.lua b/home/private_dot_config/lvim/lua/keybindings.lua index a247e27..7b5edda 100644 --- a/home/private_dot_config/lvim/lua/keybindings.lua +++ b/home/private_dot_config/lvim/lua/keybindings.lua @@ -14,6 +14,9 @@ map('v','jk','',{noremap=true}) map('n', "H", "^",{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