diff --git a/.bash_aliases b/.bash_aliases index 087d0c5..7653c71 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -1 +1,3 @@ alias gl="git log --oneline --decorate" +alias fuckyou="swaymsg output \* dpms on" +alias fuckyou2="swaymsg output eDP-1 dpms on" diff --git a/nvim/after/plugin/treesitter.lua b/nvim/after/plugin/treesitter.lua index 23de6b0..da78e20 100644 --- a/nvim/after/plugin/treesitter.lua +++ b/nvim/after/plugin/treesitter.lua @@ -1,4 +1,4 @@ -require'nvim-treesitter.configs'.setup { +require 'nvim-treesitter.configs'.setup { -- A list of parser names, or "all" (the five listed parsers should always be installed) ensure_installed = { "c", "lua", "vim", "go", "zig", "rust" }, diff --git a/nvim/lua/RageCage64/set.lua b/nvim/lua/RageCage64/set.lua index 2f9da0d..2f2eada 100644 --- a/nvim/lua/RageCage64/set.lua +++ b/nvim/lua/RageCage64/set.lua @@ -1,9 +1,9 @@ vim.opt.nu = true vim.opt.relativenumber = true -vim.opt.tabstop = 2 -vim.opt.softtabstop = 2 -vim.opt.shiftwidth = 2 +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 4 vim.opt.expandtab = true vim.opt.smartindent = true diff --git a/shell_functions.sh b/shell_functions.sh index c2e220c..44b9f0f 100644 --- a/shell_functions.sh +++ b/shell_functions.sh @@ -1,10 +1,15 @@ function sync_fork() { - git fetch upstream - BRANCH=$1 - if [ -z "$BRANCH" ]; then - BRANCH="main" - fi - git rebase upstream/$BRANCH - git push -f + git fetch upstream + BRANCH=$1 + if [ -z "$BRANCH" ]; then + BRANCH="main" + fi + git rebase upstream/$BRANCH + git push -f } +function unfreeze_laptop() { + swaymsg "output eDP-1 dpms off" + sleep 1 + swaymsg "output eDP-1 dpms on" +} diff --git a/sway/config b/sway/config index cb42b47..0ec6626 100644 --- a/sway/config +++ b/sway/config @@ -14,7 +14,7 @@ set $down j set $up k set $right l # Your preferred terminal emulator -set $term foot +set $term mate-terminal # Locker set $locker sway_manual_lock # Your preferred application launcher @@ -25,6 +25,8 @@ set $menu exec wofi --show drun # Monitors set $officemonitor 'Lenovo Group Limited LEN T32p-20 VNA70PG1' +set $cottagemonitor 'Dell Inc. DELL P2722H FYH8FC3' +set $laptopdisplay 'Unknown 0x1400 0x00000000' include /etc/sway/config-vars.d/* @@ -39,6 +41,7 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill # # You can get the names of your outputs by running: swaymsg -t get_outputs output $officemonitor scale 1.5 +output $laptopdisplay scale 2 ### Idle configuration # @@ -60,8 +63,6 @@ bindsym $mod+Ctrl+l exec $locker exec swayidle -w \ before-sleep 'playerctl pause' \ timeout 300 '$locker' \ - timeout 310 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' - ### Input configuration # @@ -285,4 +286,14 @@ bindsym XF86AudioPlay exec playerctl play-pause bindsym XF86AudioNext exec playerctl next bindsym XF86AudioPrev exec playerctl previous +# Screenshots +# Ctrl -> selection; Shift -> clipboard +# selection to clipboard +bindsym Print exec grimshot copy area +bindsym Ctrl+Print exec snipit --copy + +# Making screenshare work maybe? +#exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=swaykeepassxc XDG_SESSION_DESKTOP=sway XDG_SESSION_TYPE=wayland +exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=sway XDG_SESSION_DESKTOP=sway XDG_SESSION_TYPE=wayland + include /etc/sway/config.d/* diff --git a/sway_manual_lock b/sway_manual_lock index 9651b7e..f931c13 100755 --- a/sway_manual_lock +++ b/sway_manual_lock @@ -25,12 +25,14 @@ timeout=10 # the script is terminated, so we need to execute it in the background # to be able to terminate it later (unless you like your screen turning # off every 10 seconds for some reason?) -swayidle \ - timeout $timeout 'swaymsg output \* dpms off' \ - resume 'swaymsg output \* dpms on' \ - & -playerctl play-pause +# COMMENTING THIS OUT FOR NOW BECAUSE IT"S BEING POOPY +# swayidle \ +# timeout $timeout 'swaymsg output \* dpms off' \ +# resume 'swaymsg output \* dpms on' \ +# & + +playerctl pause # Lock the screen and wait for it to be unlocked. swaylock -f -e -c 1d2021 --inside-color 000000b3 -s fill -i ~/.cache/lockscreen diff --git a/sway_pkg b/sway_pkg index c723868..fcfa4d1 100644 --- a/sway_pkg +++ b/sway_pkg @@ -1 +1 @@ -wofi i3status playerctl brightnessctl pulseaudio-utils +wofi i3status playerctl brightnessctl pulseaudio-utils grimshot