From cc134086cb3afe7821daea51e7fe10f0629e6f8a Mon Sep 17 00:00:00 2001 From: Ian Keane Date: Thu, 7 Jul 2022 17:53:45 -0400 Subject: [PATCH] Changes before laptop nuke --- README.md | 7 + dotfiles/bin/scripts/gapcycle | 15 ++ dotfiles/bin/scripts/languagecycle | 7 + dotfiles/bin/scripts/layoutcycle | 37 +++++ dotfiles/bspwm/.config/bspwm/bspwmrc | 1 + dotfiles/fish/.config/fish/config.fish | 8 +- dotfiles/fish/.config/fish/fish_variables | 5 +- .../.config/fish/functions/dunsttest.fish | 3 + dotfiles/fish/.config/fish/functions/vim.fish | 3 + .../flavours/.config/flavours/config.toml | 4 +- .../dunst/templates/default.mustache | 2 +- .../templates/nvim/templates/default.mustache | 32 ++-- dotfiles/sxhkd/.config/sxhkd/sxhkdrc | 35 ++-- dotfiles/task/.taskrc | 2 +- dotfiles/x/.xinitrc | 1 + installed.txt | 50 ------ warez.sqg | 156 ++++++++++++++++++ 17 files changed, 273 insertions(+), 95 deletions(-) create mode 100755 dotfiles/bin/scripts/gapcycle create mode 100755 dotfiles/bin/scripts/languagecycle create mode 100755 dotfiles/bin/scripts/layoutcycle create mode 100644 dotfiles/fish/.config/fish/functions/dunsttest.fish create mode 100644 dotfiles/fish/.config/fish/functions/vim.fish delete mode 100644 installed.txt create mode 100644 warez.sqg diff --git a/README.md b/README.md index 6b27f09..1762727 100644 --- a/README.md +++ b/README.md @@ -24,3 +24,10 @@ todo: move vimwiki out of this repo, configure so that home has a /wiki and a /b Notes on fish: After stowing fish, should be good to run: `curl -L https://get.oh-my.fish | fish` + +# Other things that need to be installed manually +st +dmenu +lf +fzf (sbopkg version still not good?) + diff --git a/dotfiles/bin/scripts/gapcycle b/dotfiles/bin/scripts/gapcycle new file mode 100755 index 0000000..194e1bf --- /dev/null +++ b/dotfiles/bin/scripts/gapcycle @@ -0,0 +1,15 @@ +#!/usr/bin/fish + +set gap (bspc config window_gap) + +if [ $gap = 40 ] + set new_gap 18 +else if [ $gap = 18 ] + set new_gap 12 +else if [ $gap = 12 ] + set new_gap 0 +else if [ $gap = 0 ] + set new_gap 40 +end + +bspc config window_gap $new_gap diff --git a/dotfiles/bin/scripts/languagecycle b/dotfiles/bin/scripts/languagecycle new file mode 100755 index 0000000..de11442 --- /dev/null +++ b/dotfiles/bin/scripts/languagecycle @@ -0,0 +1,7 @@ +#!/usr/bin/fish + +if [ (xkblayout-state print "%n") = "Russian" ] + setxkbmap -layout us + else + setxkbmap -layout ru + end diff --git a/dotfiles/bin/scripts/layoutcycle b/dotfiles/bin/scripts/layoutcycle new file mode 100755 index 0000000..5f54f7d --- /dev/null +++ b/dotfiles/bin/scripts/layoutcycle @@ -0,0 +1,37 @@ +#!/usr/bin/fish + +bsp-layout next --layouts tall,grid,rgrid,tiled + +set layout (bsp-layout get) + +if ps -aux | grep layoutcycle | grep -v grep + exit +else if [ $layout = "tall" ] + notify-send -t 1000 "Layout: Tall" (echo \ + " ______________ \n" \ + " | |____| \n" \ + " | |____| \n" \ + " | |____| \n" \ + " |________|____| " ) +else if [ $layout = "grid" ] + notify-send -t 1000 "Layout: hGrid" (echo \ + " ____________ \n" \ + " | | | | \n" \ + " |___|___|___| \n" \ + " | | | | \n" \ + " |___|___|___| " ) +else if [ $layout = "rgrid" ] + vgrid + notify-send -t 1000 "Layout: vGrid" (echo \ + " ____________ \n" \ + " |_____|_____| \n" \ + " |_____|_____| \n" \ + " |_____|_____| " ) +else if [ $layout = "tiled" ] + notify-send -t 1000 "Layout: Tiled" (echo \ + " ______________ \n" \ + " | | | \n" \ + " | |____| \n" \ + " | | | | \n" \ + " |________|__|_| " ) +end diff --git a/dotfiles/bspwm/.config/bspwm/bspwmrc b/dotfiles/bspwm/.config/bspwm/bspwmrc index 0e732cf..3a5d8dd 100755 --- a/dotfiles/bspwm/.config/bspwm/bspwmrc +++ b/dotfiles/bspwm/.config/bspwm/bspwmrc @@ -28,3 +28,4 @@ bspc config gapless_monocle true lemonlaunch & xsetroot -cursor_name left_ptr & +notify-send "thots" "$(fortune)" -c 15 diff --git a/dotfiles/fish/.config/fish/config.fish b/dotfiles/fish/.config/fish/config.fish index 92ef889..ac3761a 100644 --- a/dotfiles/fish/.config/fish/config.fish +++ b/dotfiles/fish/.config/fish/config.fish @@ -2,10 +2,10 @@ set EDITOR vim set PAGER bat set BROWSER firefox -if status --is-interactive - set BASE16_SHELL "$HOME/.config/base16-shell/" - source "$BASE16_SHELL/profile_helper.fish" -end +# if status --is-interactive +# set BASE16_SHELL "$HOME/.config/base16-shell/" +# source "$BASE16_SHELL/profile_helper.fish" +# end begin set --local AUTOJUMP_PATH $HOME/.config/fish/functions/autojump.fish diff --git a/dotfiles/fish/.config/fish/fish_variables b/dotfiles/fish/.config/fish/fish_variables index a8412c2..456a93d 100644 --- a/dotfiles/fish/.config/fish/fish_variables +++ b/dotfiles/fish/.config/fish/fish_variables @@ -1,6 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 -SETUVAR __fish_initialized:3100 +SETUVAR __fish_initialized:3400 SETUVAR _fish_abbr_mux:tmuxinator SETUVAR _fisher_jorgebucaran_2F_fisher_files:/Users/iankeane/\x2econfig/fish/functions/fisher\x2efish\x1e/Users/iankeane/\x2econfig/fish/completions/fisher\x2efish SETUVAR _fisher_jorgebucaran_2F_nvm_2E_fish_files:/Users/iankeane/\x2econfig/fish/functions/_nvm_index_update\x2efish\x1e/Users/iankeane/\x2econfig/fish/functions/_nvm_list\x2efish\x1e/Users/iankeane/\x2econfig/fish/functions/_nvm_version_activate\x2efish\x1e/Users/iankeane/\x2econfig/fish/functions/_nvm_version_deactivate\x2efish\x1e/Users/iankeane/\x2econfig/fish/functions/nvm\x2efish\x1e/Users/iankeane/\x2econfig/fish/conf\x2ed/nvm\x2efish\x1e/Users/iankeane/\x2econfig/fish/completions/nvm\x2efish @@ -32,6 +32,7 @@ SETUVAR fish_pager_color_completion:\x1d SETUVAR fish_pager_color_description:B3A06D\x1eyellow SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_user_paths:/Users/iankeane/\x2elocal/bin\x1e/Users/iankeane/\x2egem/ruby/3\x2e1\x2e0/bin\x1e/usr/local/Cellar/ruby/3\x2e1\x2e2/bin +SETUVAR fish_pager_color_selected_background:\x2dr +SETUVAR fish_user_paths:/home/green/scripts\x1e/home/green/\x2elocal/bin\x1e/home/green/\x2ecargo/bin\x1e/usr/games\x1e/Users/iankeane/\x2elocal/bin\x1e/Users/iankeane/\x2egem/ruby/3\x2e1\x2e0/bin\x1e/usr/local/Cellar/ruby/3\x2e1\x2e2/bin SETUVAR nvm_data:/Users/iankeane/\x2elocal/share/nvm SETUVAR nvm_mirror:https\x3a//nodejs\x2eorg/dist diff --git a/dotfiles/fish/.config/fish/functions/dunsttest.fish b/dotfiles/fish/.config/fish/functions/dunsttest.fish new file mode 100644 index 0000000..61cdd27 --- /dev/null +++ b/dotfiles/fish/.config/fish/functions/dunsttest.fish @@ -0,0 +1,3 @@ +function dunsttest --wraps='notify-send -u low "test" && notify-send -u normal "test" && notify-send -u critical "test"' --description 'alias dunsttest notify-send -u low "test" && notify-send -u normal "test" && notify-send -u critical "test"' + notify-send -u low "test" && notify-send -u normal "test" && notify-send -u critical "test" $argv; +end diff --git a/dotfiles/fish/.config/fish/functions/vim.fish b/dotfiles/fish/.config/fish/functions/vim.fish new file mode 100644 index 0000000..f9e4cf4 --- /dev/null +++ b/dotfiles/fish/.config/fish/functions/vim.fish @@ -0,0 +1,3 @@ +function vim --wraps=nvim --description 'alias vim nvim' + nvim $argv; +end diff --git a/dotfiles/flavours/.config/flavours/config.toml b/dotfiles/flavours/.config/flavours/config.toml index 439985f..8f53967 100644 --- a/dotfiles/flavours/.config/flavours/config.toml +++ b/dotfiles/flavours/.config/flavours/config.toml @@ -15,7 +15,7 @@ hook = "pkill dunst" [[items]] -file = "~/.local/bin/lemonlaunch" +file = "~/scripts/lemonlaunch" template = "lemonlaunch" rewrite = true hook = "lemonlaunch &" @@ -58,7 +58,7 @@ end = "-- end flavours" hook = "echo 'loaded'" [[items]] -file = "~/.local/bin/dmenu_run_top" +file = "~/scripts/dmenu_run_top" template = "dmenu_run_top" rewrite = false start = "# start flavours" diff --git a/dotfiles/flavours/.local/share/flavours/base16/templates/dunst/templates/default.mustache b/dotfiles/flavours/.local/share/flavours/base16/templates/dunst/templates/default.mustache index 1ad8168..f238ae6 100644 --- a/dotfiles/flavours/.local/share/flavours/base16/templates/dunst/templates/default.mustache +++ b/dotfiles/flavours/.local/share/flavours/base16/templates/dunst/templates/default.mustache @@ -1,4 +1,4 @@ -frame_color = "#{{base05-hex}}" +frame_color = "#{{base01-hex}}" separator_color = "#{{base05-hex}}" [urgency_low] diff --git a/dotfiles/flavours/.local/share/flavours/base16/templates/nvim/templates/default.mustache b/dotfiles/flavours/.local/share/flavours/base16/templates/nvim/templates/default.mustache index 4d2e008..b4d6148 100644 --- a/dotfiles/flavours/.local/share/flavours/base16/templates/nvim/templates/default.mustache +++ b/dotfiles/flavours/.local/share/flavours/base16/templates/nvim/templates/default.mustache @@ -1,18 +1,18 @@ require('base16-colorscheme').setup({ - base00 = '#{{base01-hex}}', - base01 = '#{{base02-hex}}', - base02 = '#{{base03-hex}}', - base03 = '#{{base04-hex}}', - base04 = '#{{base05-hex}}', - base05 = '#{{base06-hex}}', - base06 = '#{{base07-hex}}', - base07 = '#{{base08-hex}}', - base08 = '#{{base09-hex}}', - base09 = '#{{base0A-hex}}', - base0A = '#{{base0B-hex}}', - base0B = '#{{base0C-hex}}', - base0C = '#{{base0D-hex}}', - base0D = '#{{base0E-hex}}', - base0E = '#{{base0F-hex}}', - base0F = '#{{base0G-hex}}' + base00 = '#{{base00-hex}}', + base01 = '#{{base01-hex}}', + base02 = '#{{base02-hex}}', + base03 = '#{{base03-hex}}', + base04 = '#{{base04-hex}}', + base05 = '#{{base05-hex}}', + base06 = '#{{base06-hex}}', + base07 = '#{{base07-hex}}', + base08 = '#{{base08-hex}}', + base09 = '#{{base09-hex}}', + base0A = '#{{base0A-hex}}', + base0B = '#{{base0B-hex}}', + base0C = '#{{base0C-hex}}', + base0D = '#{{base0D-hex}}', + base0E = '#{{base0E-hex}}', + base0F = '#{{base0F-hex}}' }) diff --git a/dotfiles/sxhkd/.config/sxhkd/sxhkdrc b/dotfiles/sxhkd/.config/sxhkd/sxhkdrc index 23a55d0..ed4d7da 100644 --- a/dotfiles/sxhkd/.config/sxhkd/sxhkdrc +++ b/dotfiles/sxhkd/.config/sxhkd/sxhkdrc @@ -3,10 +3,10 @@ # # start flavours -set norm_bg "#41323f" -set norm_fg "#b9b6b0" -set sel_bg "#48b685" -set sel_fg "#41323f" +set norm_bg "#343D46" +set norm_fg "#CDD3DE" +set sel_bg "#99C794" +set sel_fg "#343D46" # end flavours # terminal emulator @@ -41,7 +41,7 @@ super + q # alternate between the tiled and monocle layout # super + m -# bspc desktop -l next +# bspc desktop -l next # send the newest marked node to the newest preselected node super + y @@ -125,11 +125,11 @@ super + ctrl + shift + space # # expand a window by moving one of its side outward # super + alt + {h,j,k,l} -# bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0} +# bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0} # # contract a window by moving one of its side inward # super + alt + shift + {h,j,k,l} -# bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0} +# bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0} # Resize windows # https://old.reddit.com/r/bspwm/comments/r5stxu/resizing_windows_nicely_in_my_opinion/ @@ -148,19 +148,19 @@ super + {Left,Down,Up,Right} bspc node -v {-20 0,0 20,0 -20,20 0} # super + d -# dmenu_run -l 15 -i +# dmenu_run -l 15 -i # super + d -# dmenu_run -l 15 -i +# dmenu_run -l 15 -i super + d dmenu_run_top super + w - bspc config window_gap 0 + gapcycle super + shift + w - bspc config window_gap 12 + layoutcycle && sleep .1 super + m {bspc rule -a \* -o state=floating && st -e ncmpcpp} @@ -179,11 +179,11 @@ super + c {bspc rule -a \* -o state=floating && st -e calcurse -D ~/.config/calcurse } # Increase/descrease gap size -super + z - bspc config window_gap $(($(bspc config window_gap) - 3)) +# super + z +# bspc config window_gap $(($(bspc config window_gap) - 3)) -super + shift + z - bspc config window_gap $(($(bspc config window_gap) + 3)) +# super + shift + z +# bspc config window_gap $(($(bspc config window_gap) + 3)) super + r {bspc rule -a \* -o state=floating && st -e ranger} @@ -192,9 +192,6 @@ super + b exec qutebrowser super + x - setxkbmap -layout us - -super + shift + x - setxkbmap -layout ru + languagecycle # After quitting bar, reset spaces: bspc config top_padding 0 or bottom_padding diff --git a/dotfiles/task/.taskrc b/dotfiles/task/.taskrc index 6de65fe..3675be3 100644 --- a/dotfiles/task/.taskrc +++ b/dotfiles/task/.taskrc @@ -15,7 +15,7 @@ # Use the command 'task show' to see all defaults and overrides # Files -data.location=/Users/iankeane/.task +data.location=/home/green/.task # To use the default location of the XDG directories, # move this configuration file from ~/.taskrc to ~/.config/task/taskrc and uncomment below diff --git a/dotfiles/x/.xinitrc b/dotfiles/x/.xinitrc index 9fb0009..2e1e72f 100644 --- a/dotfiles/x/.xinitrc +++ b/dotfiles/x/.xinitrc @@ -1,5 +1,6 @@ #picom & +#.screenlayout/desktop_ultrawide.sh xss-lock i3lock-fancy & ntpdate pool.ntp.org xrdb .Xresources & diff --git a/installed.txt b/installed.txt deleted file mode 100644 index 2c49c28..0000000 --- a/installed.txt +++ /dev/null @@ -1,50 +0,0 @@ -# sbopkg -# Generate queuefile with `sqg -p ` -autojump -bspwm? -bat -calcurse -dtrx -fd -feh -fish -i3lock-fancy -lemonbar-xft -lutris -mpd -mpv -ncdu -ncmpcpp -neovim -neovim-remote -newsboat -nim -noto-emoji -picom -pipewire-native-jack -qutebrowser -ranger -ripgrep -rtorrent -rustup -sbcl -screenfetch -scrot -stow -sxhkd -sxiv -task -tree-sitter -unicode-character-database -xclip -xss-lock -youtube-dl -zathura-djvu - - -# Other things that need to be installed manually -st -dmenu -lf -fzf (sbopkg version still not good?) - diff --git a/warez.sqg b/warez.sqg new file mode 100644 index 0000000..cd171cf --- /dev/null +++ b/warez.sqg @@ -0,0 +1,156 @@ +BeautifulSoup4 +FontAwesome +apsw +arandr +atomicwrites +autojump +avahi +awscli +bat +bcdoc +bluez-alsa +bombadillo +botocore +btop +bubblewrap +caffeine-ng +calcurse +colorama +confuse +dmenu +dnstop +docopt +dtrx +dunst +dzen2 +fd +feh +fish +fmt +fontforge +fortune-slackware +funcsigs +functools-lru-cache +geoclue2 +giblib +girara +gnome-desktop +google-go-lang +greenlet +html5lib +imlib2 +jmespath +lemonbar-xft +libass +libcbor +libconfig +libdaemon +libev +libfido2 +libmpdclient +libplacebo +libtermkey +libtorrent +libtorrent-rasterbar +libvterm +libwpe +light +llfuse +lua +lua-lpeg +lua-luv +lua-mpack +lua53 +luajit +lutris +lxml +more-itertools +mpd +mpv +msgpack-c +msgpack-python +mujs +ncdu +ncmpcpp +neovim +neovim-remote +newsboat +nim +noto-emoji +password-store +pathlib2 +picom +pipewire-native-jack +pluggy +portaudio +psutil +py +pyOpenSSL +pyasn1 +pyewmh +pytest +pytest-runner +python-magic +python-neovim +python-xlib +python2-BeautifulSoup4 +python2-attrs +python2-scandir +python2-setuptools-scm +python2-soupsieve +python3-PyQtWebEngine +python3-dateutil +python3-defusedxml +python3-dugong +python3-pycrypto +python3-rsa +python3-soupsieve +python3-webencodings +qutebrowser +ranger +rencode +ripgrep +rtorrent +rustup +s3ql +s3transfer +sbcl +screenfetch +scrot +setconf +setproctitle +signal-desktop +sphinx +stalonetray +stfl +stow +sutils +sxhkd +sxiv +symbola-font-ttf +syncthing +task +telegram +tree-sitter +trollius +unibilium +unicode-character-database +unrar +uthash +webkit2gtk +wheel +wine +wireplumber +wpebackend-fdo +xcb-util-xrm +xclip +xdg-dbus-proxy +xdo +xkblayout-state +xss-lock +xtitle +yajl +youtube-dl +zathura +zathura-cb +zathura-djvu