From f19969ec232ff19c87c2ac5eeed6e05d7180b245 Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Mon, 4 Dec 2023 16:52:07 -0500 Subject: [PATCH] gl --- Taskfile.yml | 4 ++++ editors/neovim | 2 +- gui/i3/base.conf | 7 ++++--- gui/i3/desktop.conf | 4 ++-- gui/polybar/config.ini | 2 +- gui/sway-desktop/config | 9 ++++++--- meta/dotbot | 2 +- shells/oh-my-zsh/custom/plugins/zsh-autosuggestions | 2 +- shells/oh-my-zsh/custom/themes/powerlevel10k | 2 +- shells/zsh/zshrc | 1 + src/fzf | 2 +- src/tmux-mem-cpu-load | 2 +- 12 files changed, 24 insertions(+), 15 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index 9ba8e4d..f4d9272 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -12,3 +12,7 @@ tasks: desc: "setup defaults for arch based laptop" cmds: - scripts/install-profile thinkpad + + deploy: + cmds: + - diff --git a/editors/neovim b/editors/neovim index 1ff3319..aa50bff 160000 --- a/editors/neovim +++ b/editors/neovim @@ -1 +1 @@ -Subproject commit 1ff331968225f5854d4790de73d2b8e2af545171 +Subproject commit aa50bff9b5cf24bcda810c1d77b03a5c804ea400 diff --git a/gui/i3/base.conf b/gui/i3/base.conf index 4699ffd..7edcdda 100644 --- a/gui/i3/base.conf +++ b/gui/i3/base.conf @@ -42,11 +42,12 @@ floating_modifier $mod # start a terminal bindsym $mod+Return exec st -# lock the screen -bindsym $mod+q exec xset s activate +# suspend/hibernate computer +bindsym $mod+q exec systemctl suspend +bindsym $mod+Shift+q exec systemctl hibernate # kill focused window -bindsym $mod+Shift+q kill +bindsym $mod+Shift+x kill # start dmenu (a program launcher) bindsym $mod+d exec --no-startup-id rofi-launcher diff --git a/gui/i3/desktop.conf b/gui/i3/desktop.conf index d0531f0..e23ce88 100644 --- a/gui/i3/desktop.conf +++ b/gui/i3/desktop.conf @@ -1,8 +1,8 @@ include base.conf # binding workspaces -workspace 1 output DP-0 -workspace 2 output DP-2 +workspace 1 output DP-2 +workspace 2 output DP-0 # poly bar exec_always --no-startup-id polybar-launch.sh desktop-bar diff --git a/gui/polybar/config.ini b/gui/polybar/config.ini index 59fbe7f..4092b57 100644 --- a/gui/polybar/config.ini +++ b/gui/polybar/config.ini @@ -49,7 +49,7 @@ height = 24pt modules-left = xworkspaces focus-fast spotify spotify-len ;modules-left = xworkspaces spotify spotify-len modules-center = weather-desktop -modules-right = pulseaudio memory cpu temperature wlan eth vpn dev-bat packages seafile calendar-sync bg-selector quotes date powermenu +modules-right = pulseaudio memory cpu temperature wlan eth vpn dev-bat seafile calendar-sync bg-selector quotes date powermenu [bar/work-bar] ; desktop bar config diff --git a/gui/sway-desktop/config b/gui/sway-desktop/config index 27e8107..d7ea4b8 100644 --- a/gui/sway-desktop/config +++ b/gui/sway-desktop/config @@ -24,8 +24,11 @@ smart_gaps on #font pango:DejaVu Sans Mono 8 # Start XDG autostart .desktop files using dex. See also # https://wiki.archlinux.org/index.php/XDG_Autostart +exec_always pkill kanshi; exec kanshi + workspace 1 output DP-2 -workspace 2 output DP-0 +workspace 2 output DP-3 + exec --no-startup-id dex --autostart --environment i3 # The combination of xss-lock, nm-applet and pactl is a popular choice, so @@ -211,6 +214,6 @@ bindsym $mod+r mode "resize" #exec --no-startup-id picom-launch.sh # background -output "*" bg ~/.config/i3/wallpaper.jpg fill +# output "*" bg ~/.config/i3/wallpaper.jpg fill # poly bar -exec_always --no-startup-id polybar-launch.sh desktop-bar +# exec_always --no-startup-id polybar-launch.sh desktop-bar diff --git a/meta/dotbot b/meta/dotbot index 328bcb3..3f9e409 160000 --- a/meta/dotbot +++ b/meta/dotbot @@ -1 +1 @@ -Subproject commit 328bcb32590e5057b09bd27a40bc2fb21385fbf3 +Subproject commit 3f9e409669172ad662e82fca791f0ad16dce5edd diff --git a/shells/oh-my-zsh/custom/plugins/zsh-autosuggestions b/shells/oh-my-zsh/custom/plugins/zsh-autosuggestions index a411ef3..c3d4e57 160000 --- a/shells/oh-my-zsh/custom/plugins/zsh-autosuggestions +++ b/shells/oh-my-zsh/custom/plugins/zsh-autosuggestions @@ -1 +1 @@ -Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8 +Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5 diff --git a/shells/oh-my-zsh/custom/themes/powerlevel10k b/shells/oh-my-zsh/custom/themes/powerlevel10k index 951d695..862440a 160000 --- a/shells/oh-my-zsh/custom/themes/powerlevel10k +++ b/shells/oh-my-zsh/custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit 951d6957895b1887567b3ea7e548f9533daa3c83 +Subproject commit 862440ae112603c8e2d202f6edb94eeaa1509120 diff --git a/shells/zsh/zshrc b/shells/zsh/zshrc index 5b0a561..faf2cbc 100644 --- a/shells/zsh/zshrc +++ b/shells/zsh/zshrc @@ -27,6 +27,7 @@ fi # fixing gopath and binaries export GOPATH="$HOME/.local/share/go" +export PATH=$PATH:"$HOME"/.local/share/cargo/bin # moving cargo cache dir export CARGO_HOME="$HOME/.local/share/cargo" diff --git a/src/fzf b/src/fzf index 86e4f4a..b1a0ab8 160000 --- a/src/fzf +++ b/src/fzf @@ -1 +1 @@ -Subproject commit 86e4f4a84180da7f5b99c3db8043cb9d92cb9189 +Subproject commit b1a0ab8086f061640948299b9ed90a6b0c61c143 diff --git a/src/tmux-mem-cpu-load b/src/tmux-mem-cpu-load index 451300e..9a9abc5 160000 --- a/src/tmux-mem-cpu-load +++ b/src/tmux-mem-cpu-load @@ -1 +1 @@ -Subproject commit 451300eda243251b60d13da6d028b9ff4e8b92cb +Subproject commit 9a9abc5d13d94aa404c02d19b7184143d020ecb7