From 2a2de6d8f04dcabd41d28f4e06e10a0f35ff8dde Mon Sep 17 00:00:00 2001 From: Luan Santos Date: Tue, 18 Aug 2020 19:53:56 -0700 Subject: [PATCH] i should really just commit more often --- alacritty/.config/alacritty/alacritty.yml | 92 +++++++++++------ .../autorandr/mobile-plugged-ultrawide/config | 8 +- autorandr/.config/autorandr/mobile/config | 2 +- autorandr/.config/autorandr/mobile/postswitch | 2 +- {home => bin}/bin/antibody | Bin {home => bin}/bin/appsmenu | 0 {home => bin}/bin/clipmenu | 0 {home => bin}/bin/configure-touchpad | 0 {home => bin}/bin/dropbox-run | 0 {home => bin}/bin/greenclip | Bin {home => bin}/bin/i3-focus-last | 0 {home => bin}/bin/i3-output-swap | 0 {home => bin}/bin/i3-rename-workspace | 1 + {home => bin}/bin/import-gsettings | 0 {home => bin}/bin/lock-session | 0 {home => bin}/bin/networkmenu | 0 {home => bin}/bin/notifypackages | 0 {home => bin}/bin/op-rofi | 0 {home => bin}/bin/powermenu | 0 {home => bin}/bin/restart-polybar | 0 {home => bin}/bin/rofi-pulseaudio | 0 {home => bin}/bin/spotify-refresh | 0 {home => bin}/bin/toggle-terminal-theme | 0 {home => bin}/bin/util.py | 0 {home => bin}/bin/virtualdisplay | 0 gitconfig | 2 +- gnupg/.gnupg/gpg.conf | 1 + gtk/.config/gtk-2.0/gtkfilechooser.ini | 4 +- home/bin/bzlgenall | 34 ------- i3/.config/i3/config | 2 +- i3/.config/i3/startup.sh | 10 +- install.sh | 3 + mako/.config/mako/config | 9 +- nvim/.config/nvim/user/after.vim | 31 ++---- nvim/.config/nvim/user/plug.vim | 2 + polybar/.config/polybar/config | 2 +- ssh/.ssh/config | 5 + ssh/.ssh/config.d/dropbox | 93 ------------------ sway/.config/sway/config | 15 ++- .../user/timers.target.wants/wal.timer | 1 - waybar/.config/waybar/config | 14 ++- waybar/.config/waybar/packages.sh | 6 +- waybar/.config/waybar/style.css | 7 +- zsh/.zshrc | 4 + 44 files changed, 138 insertions(+), 212 deletions(-) rename {home => bin}/bin/antibody (100%) rename {home => bin}/bin/appsmenu (100%) rename {home => bin}/bin/clipmenu (100%) rename {home => bin}/bin/configure-touchpad (100%) rename {home => bin}/bin/dropbox-run (100%) rename {home => bin}/bin/greenclip (100%) rename {home => bin}/bin/i3-focus-last (100%) rename {home => bin}/bin/i3-output-swap (100%) rename {home => bin}/bin/i3-rename-workspace (99%) rename {home => bin}/bin/import-gsettings (100%) rename {home => bin}/bin/lock-session (100%) rename {home => bin}/bin/networkmenu (100%) rename {home => bin}/bin/notifypackages (100%) rename {home => bin}/bin/op-rofi (100%) rename {home => bin}/bin/powermenu (100%) rename {home => bin}/bin/restart-polybar (100%) rename {home => bin}/bin/rofi-pulseaudio (100%) rename {home => bin}/bin/spotify-refresh (100%) rename {home => bin}/bin/toggle-terminal-theme (100%) rename {home => bin}/bin/util.py (100%) rename {home => bin}/bin/virtualdisplay (100%) delete mode 100755 home/bin/bzlgenall delete mode 100644 ssh/.ssh/config.d/dropbox delete mode 120000 systemd/.config/systemd/user/timers.target.wants/wal.timer diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index 5dd187f..4ec578b 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -37,7 +37,7 @@ font: style: Italic # Point size of the font - size: 11.0 + size: 11.5 # Offset is the extra space around each character. offset.y can be thought of # as modifying the linespacing, and offset.x as modifying the letter spacing. offset: @@ -49,34 +49,70 @@ font: # false. use_thin_strokes: true -# Colors -colors: - # Default colors - primary: - background: '0x1d1f21' - foreground: '0xc5c8c6' +schemes: + dark: &dark + # Default colors + primary: + background: '0x1d1f21' + foreground: '0xc5c8c6' - # Normal colors - normal: - black: '0x282a2e' - red: '0xa54242' - green: '0x8c9440' - yellow: '0xde935f' - blue: '0x5f819d' - magenta: '0x85678f' - cyan: '0x5e8d87' - white: '0x707880' + # Normal colors + normal: + black: '0x282a2e' + red: '0xa54242' + green: '0x8c9440' + yellow: '0xde935f' + blue: '0x5f819d' + magenta: '0x85678f' + cyan: '0x5e8d87' + white: '0x707880' + + # Bright colors + bright: + black: '0x373b41' + red: '0xcc6666' + green: '0xb5bd68' + yellow: '0xf0c674' + blue: '0x81a2be' + magenta: '0xb294bb' + cyan: '0x8abeb7' + white: '0xc5c8c6' + + solarized_light: &light + # Default colors + primary: + background: '0xfdf6e3' + foreground: '0x586e75' - # Bright colors - bright: - black: '0x373b41' - red: '0xcc6666' - green: '0xb5bd68' - yellow: '0xf0c674' - blue: '0x81a2be' - magenta: '0xb294bb' - cyan: '0x8abeb7' - white: '0xc5c8c6' + # Colors the cursor will use if `custom_cursor_colors` is true + cursor: + text: '0xfdf6e3' + cursor: '0x586e75' + + # Normal colors + normal: + black: '0xfdf6e3' + red: '0xdc322f' + green: '0x859900' + yellow: '0xb58900' + blue: '0x268bd2' + magenta: '0x6c71c4' + cyan: '0x2aa198' + white: '0x586e75' + + # Bright colors + bright: + black: '0x839496' + red: '0xcb4b16' + green: '0xeee8d5' + yellow: '0x93a1a1' + blue: '0x657b83' + magenta: '0x073642' + cyan: '0xd33682' + white: '0x002b36' + +# Colors +colors: *dark # Visual Bell @@ -101,7 +137,7 @@ colors: # # To completely disable the visual bell, set its duration to 0. # -visual_bell: +bell: animation: EaseOutExpo duration: 0 diff --git a/autorandr/.config/autorandr/mobile-plugged-ultrawide/config b/autorandr/.config/autorandr/mobile-plugged-ultrawide/config index b6760a1..abbb3d4 100644 --- a/autorandr/.config/autorandr/mobile-plugged-ultrawide/config +++ b/autorandr/.config/autorandr/mobile-plugged-ultrawide/config @@ -5,11 +5,11 @@ off output DP1 crtc 0 mode 3440x1440 -pos 3840x0 +pos 1920x0 primary rate 49.99 output eDP1 crtc 1 -mode 3840x2160 -pos 0x1180 -rate 60.00 +mode 1920x1080 +pos 0x736 +rate 59.96 diff --git a/autorandr/.config/autorandr/mobile/config b/autorandr/.config/autorandr/mobile/config index 2003915..d4fb740 100644 --- a/autorandr/.config/autorandr/mobile/config +++ b/autorandr/.config/autorandr/mobile/config @@ -6,7 +6,7 @@ output VIRTUAL1 off output eDP1 crtc 0 -mode 3840x2160 +mode 1920x1080 pos 0x0 primary rate 60.00 diff --git a/autorandr/.config/autorandr/mobile/postswitch b/autorandr/.config/autorandr/mobile/postswitch index c3c769b..0966b2e 100755 --- a/autorandr/.config/autorandr/mobile/postswitch +++ b/autorandr/.config/autorandr/mobile/postswitch @@ -1,6 +1,6 @@ #!/bin/bash -xrdb -merge -I$HOME $HOME/.Xresources-mobile +xrdb -merge -I$HOME $HOME/.Xresources-96 DPI="$(xrdb -query | grep 'Xft.dpi:' | awk '{ print $2 }')" xrandr --dpi "$DPI" diff --git a/home/bin/antibody b/bin/bin/antibody similarity index 100% rename from home/bin/antibody rename to bin/bin/antibody diff --git a/home/bin/appsmenu b/bin/bin/appsmenu similarity index 100% rename from home/bin/appsmenu rename to bin/bin/appsmenu diff --git a/home/bin/clipmenu b/bin/bin/clipmenu similarity index 100% rename from home/bin/clipmenu rename to bin/bin/clipmenu diff --git a/home/bin/configure-touchpad b/bin/bin/configure-touchpad similarity index 100% rename from home/bin/configure-touchpad rename to bin/bin/configure-touchpad diff --git a/home/bin/dropbox-run b/bin/bin/dropbox-run similarity index 100% rename from home/bin/dropbox-run rename to bin/bin/dropbox-run diff --git a/home/bin/greenclip b/bin/bin/greenclip similarity index 100% rename from home/bin/greenclip rename to bin/bin/greenclip diff --git a/home/bin/i3-focus-last b/bin/bin/i3-focus-last similarity index 100% rename from home/bin/i3-focus-last rename to bin/bin/i3-focus-last diff --git a/home/bin/i3-output-swap b/bin/bin/i3-output-swap similarity index 100% rename from home/bin/i3-output-swap rename to bin/bin/i3-output-swap diff --git a/home/bin/i3-rename-workspace b/bin/bin/i3-rename-workspace similarity index 99% rename from home/bin/i3-rename-workspace rename to bin/bin/i3-rename-workspace index f4d55c5..69e4f6b 100755 --- a/home/bin/i3-rename-workspace +++ b/bin/bin/i3-rename-workspace @@ -46,6 +46,7 @@ WINDOW_ICONS = { 'blender': fa.icons['cube'], 'chromium': fa.icons['chrome'], 'cura': fa.icons['cube'], + 'code-oss': fa.icons['code'], 'darktable': fa.icons['image'], 'discord': fa.icons['discord'], 'eclipse': fa.icons['code'], diff --git a/home/bin/import-gsettings b/bin/bin/import-gsettings similarity index 100% rename from home/bin/import-gsettings rename to bin/bin/import-gsettings diff --git a/home/bin/lock-session b/bin/bin/lock-session similarity index 100% rename from home/bin/lock-session rename to bin/bin/lock-session diff --git a/home/bin/networkmenu b/bin/bin/networkmenu similarity index 100% rename from home/bin/networkmenu rename to bin/bin/networkmenu diff --git a/home/bin/notifypackages b/bin/bin/notifypackages similarity index 100% rename from home/bin/notifypackages rename to bin/bin/notifypackages diff --git a/home/bin/op-rofi b/bin/bin/op-rofi similarity index 100% rename from home/bin/op-rofi rename to bin/bin/op-rofi diff --git a/home/bin/powermenu b/bin/bin/powermenu similarity index 100% rename from home/bin/powermenu rename to bin/bin/powermenu diff --git a/home/bin/restart-polybar b/bin/bin/restart-polybar similarity index 100% rename from home/bin/restart-polybar rename to bin/bin/restart-polybar diff --git a/home/bin/rofi-pulseaudio b/bin/bin/rofi-pulseaudio similarity index 100% rename from home/bin/rofi-pulseaudio rename to bin/bin/rofi-pulseaudio diff --git a/home/bin/spotify-refresh b/bin/bin/spotify-refresh similarity index 100% rename from home/bin/spotify-refresh rename to bin/bin/spotify-refresh diff --git a/home/bin/toggle-terminal-theme b/bin/bin/toggle-terminal-theme similarity index 100% rename from home/bin/toggle-terminal-theme rename to bin/bin/toggle-terminal-theme diff --git a/home/bin/util.py b/bin/bin/util.py similarity index 100% rename from home/bin/util.py rename to bin/bin/util.py diff --git a/home/bin/virtualdisplay b/bin/bin/virtualdisplay similarity index 100% rename from home/bin/virtualdisplay rename to bin/bin/virtualdisplay diff --git a/gitconfig b/gitconfig index 2e3e18b..028ba28 100644 --- a/gitconfig +++ b/gitconfig @@ -37,7 +37,7 @@ autocrlf = false editor = vim excludesfile = /Users/luan/.gitignore_global - # pager = diff-so-fancy | less --tabs=4 -RFX + pager = diff-so-fancy | less --tabs=4 -RFX [advice] statusHints = false [diff] diff --git a/gnupg/.gnupg/gpg.conf b/gnupg/.gnupg/gpg.conf index d53cb13..2463c25 100644 --- a/gnupg/.gnupg/gpg.conf +++ b/gnupg/.gnupg/gpg.conf @@ -1 +1,2 @@ use-agent +keyserver pool.sks-keyservers.net diff --git a/gtk/.config/gtk-2.0/gtkfilechooser.ini b/gtk/.config/gtk-2.0/gtkfilechooser.ini index 2718760..778ad58 100644 --- a/gtk/.config/gtk-2.0/gtkfilechooser.ini +++ b/gtk/.config/gtk-2.0/gtkfilechooser.ini @@ -2,8 +2,8 @@ LocationMode=path-bar ShowHidden=false ShowSizeColumn=true -GeometryX=0 -GeometryY=0 +GeometryX=1156 +GeometryY=304 GeometryWidth=1128 GeometryHeight=861 SortColumn=name diff --git a/home/bin/bzlgenall b/home/bin/bzlgenall deleted file mode 100755 index b8cbfc9..0000000 --- a/home/bin/bzlgenall +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python2 - -import os -import subprocess - - -def changed_files(): - master = subprocess.check_output(["/usr/bin/git", "merge-base", "@{upstream}", "HEAD"]).strip() - output = subprocess.check_output(["/usr/bin/git", "diff", "--name-only", master]) - return output.split('\n') - - -def closest_build_file(path): - dirname = os.path.dirname(path) - while dirname: - build_path = os.path.join(dirname, 'BUILD') - if os.path.exists(build_path): - return build_path - dirname = os.path.dirname(dirname) - - -build_files = set() -paths = changed_files() -for path in paths: - if path.startswith('dropbox/proto') or path.startswith('go/src/dropbox/proto'): - continue - if os.path.exists(path): - build_files.add(closest_build_file(path)) - - -cmd = ['bzl', '--allow-deletes', 'gen'] + ['//%s' % os.path.dirname(build_path) for build_path in build_files] - -print ' '.join(cmd) -subprocess.check_call(cmd) diff --git a/i3/.config/i3/config b/i3/.config/i3/config index f912a73..3caa5fb 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -21,7 +21,7 @@ bindsym $mod+Shift+q kill bindsym $mod+d exec appsmenu bindsym $mod+shift+v exec clipmenu -focus_wrapping force +focus_wrapping no # change focus bindsym $mod+h focus left diff --git a/i3/.config/i3/startup.sh b/i3/.config/i3/startup.sh index 6456880..e2e8157 100755 --- a/i3/.config/i3/startup.sh +++ b/i3/.config/i3/startup.sh @@ -11,10 +11,10 @@ dropbox-run() { } main() { - dropbox-run stop - while pgrep -x dropbox >/dev/null; do - sleep 1; - done + # dropbox-run stop + # while pgrep -x dropbox >/dev/null; do + # sleep 1; + # done killall -q polybar picom feh dunst xbanish xautolock feh --no-xinerama --bg-scale "$(< "${HOME}/.cache/wal/wal")" & @@ -27,7 +27,7 @@ main() { polybar -r top & - dropbox-run start + # dropbox-run start xbanish & sleep 5 diff --git a/install.sh b/install.sh index f31596c..e1b5915 100755 --- a/install.sh +++ b/install.sh @@ -15,6 +15,8 @@ sudo pacman -Syu --needed --noconfirm git base-devel stow git clone https://aur.archlinux.org/yay.git /tmp/yay || true (cd /tmp/yay && makepkg -si --noconfirm) +mkdir $HOME/bin + stow -R alacritty stow -R autorandr stow -R compton @@ -33,6 +35,7 @@ stow -R wal stow -R x11 stow -R yay stow -R zsh +stow -R bin # yay -S --needed --noconfirm - < packages.txt diff --git a/mako/.config/mako/config b/mako/.config/mako/config index 67d58ae..53c1f61 100644 --- a/mako/.config/mako/config +++ b/mako/.config/mako/config @@ -2,9 +2,11 @@ border-radius=0 font=Comfortaa 14 width=500 height=200 -border-size=2 default-timeout=10000 +border-size=2 format=%s\n%b\n%a +icon-path=/usr/share/icons/Numix-Circle +group-by=app-name,summary border-color=#C4C196 background-color=#27261DCC @@ -21,3 +23,8 @@ text-color=#C9C8C6 [urgency=high] background-color=#38A7C1AA text-color=#27261D + +[app-name=Dropbox] +background-color=#27261DAA +text-color=#C9C8C6 +default-timeout=3000 diff --git a/nvim/.config/nvim/user/after.vim b/nvim/.config/nvim/user/after.vim index 540d7fa..dfbd38d 100644 --- a/nvim/.config/nvim/user/after.vim +++ b/nvim/.config/nvim/user/after.vim @@ -1,13 +1,14 @@ " Called after everything just before setting a default colorscheme " Configure you own bindings or other preferences. e.g.: -set nonumber " No line numbers +" set nonumber " No line numbers + " let g:gitgutter_signs = 0 " No git gutter signs -augroup config#after - autocmd! - autocmd VimEnter * GitGutterDisable -augroup end -let g:SignatureEnabledAtStartup = 0 " Do not show marks +" augroup config#after +" autocmd! +" autocmd VimEnter * GitGutterDisable +" augroup end +" let g:SignatureEnabledAtStartup = 0 " Do not show marks " let g:ale_open_list = 1 @@ -20,26 +21,10 @@ else let g:lightline.colorscheme = 'material' endif -function! CFCLIIntegrationTransform(cmd) abort - let l:cmd = a:cmd - - if $TARGET_V7 ==# 'true' && l:cmd =~# 'ginkgo' - let l:cmd = substitute(l:cmd, 'ginkgo', 'ginkgo --tags V7', 1) - endif - - if getcwd() =~# 'cli' && l:cmd =~# 'integration' - return 'make build && '.l:cmd - endif - - return l:cmd -endfunction - -let g:test#custom_transformations = { 'cfcli': function('CFCLIIntegrationTransform') } -let g:test#transformation = 'cfcli' - au BufNewFile,BufRead /*.rasi setf css if filereadable(expand(':h') . '/post-after.vim') runtime user/post-after.vim endif +autocmd FileType pyst setlocal commentstring=#\ %s diff --git a/nvim/.config/nvim/user/plug.vim b/nvim/.config/nvim/user/plug.vim index 6317e5b..f3fb538 100644 --- a/nvim/.config/nvim/user/plug.vim +++ b/nvim/.config/nvim/user/plug.vim @@ -3,3 +3,5 @@ " Plug '~/my-prototype-plugin' " ... +Plug '~/src/misc/cugini/vim-vortex2' +Plug '~/src/misc/cugini/vim-pyst' diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config index c9fcd54..6e156d1 100644 --- a/polybar/.config/polybar/config +++ b/polybar/.config/polybar/config @@ -40,7 +40,7 @@ font-3 = TerminessTTF Nerd Font:style=Solid:pixelsize=12;2 font-4 = monospace:pixelsize=10;2 font-5 = sans:pixelsize=10;2 -modules-left = wired wifi memory cpu spotify +modules-left = memory cpu spotify modules-center = i3 modules-right = battery dunst microphone volume xbacklight packages date time diff --git a/ssh/.ssh/config b/ssh/.ssh/config index 4019dad..dca14ae 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -5,3 +5,8 @@ SendEnv LANG LC_* Host 192.168.*.* StrictHostKeyChecking no UserKnownHostsFile=/dev/null + +Host * + ServerAliveInterval 300 + ServerAliveCountMax 2 + diff --git a/ssh/.ssh/config.d/dropbox b/ssh/.ssh/config.d/dropbox deleted file mode 100644 index 3a1cc09..0000000 --- a/ssh/.ssh/config.d/dropbox +++ /dev/null @@ -1,93 +0,0 @@ -# NOTE: Control* settings are advanced. They can cause SSH to break in -# unexpected ways, but yield a substantial speed up when you -# repeatedly login to remote machines. If you enable them, make sure -# you read the man pages and understand the consequences. -# -# Always order configs from most-specific to least specific since the first -# value found for a setting is used. -# -# Run `man ssh_config` for more explanation of the settings. - -# We default to using the California bastion (search for bastion-sjc) -# below; swap that to use one of these other options if you're more -# regularly in New York (iad) or Texas (dfw) -Host bastion-sjc.dropboxer.net bastion-iad.dropboxer.net bastion-dfw.dropboxer.net - # ControlMaster auto - # ControlPath /tmp/ssh_mux_%h_%p_%r - # ControlPersist 15m - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa - ProxyCommand none - ServerAliveInterval 60 - # Duo 2FA can count as part of this timeout, so make sure it's long enough. - ConnectTimeout 120 - -# dev-itc -Host *-dbx *-dbx.dev.corp.dropbox.com - # ControlMaster auto - # ControlPath /tmp/ssh_mux_%h_%p_%r - # ControlPersist 15m - ForwardAgent yes - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa - ProxyCommand none - # VPN has an idle timeout. - ServerAliveInterval 60 - -# Corp -# NOTE: 172.* is far too permissive, but it's a good-enough proxy for 172.16.0.0/12 -Host 172.* *.corp.dropbox.com - # ControlMaster auto - # ControlPath /tmp/ssh_mux_%h_%p_%r - # ControlPersist 15m - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa - ProxyCommand none - -Host git.sjc.dropbox.com hg.sjc.dropbox.com - ControlPath none - ProxyCommand none - -# Production -Host 10.* dfw* sjc* iad* ttd* bwi* hhn* - # ControlMaster auto - # ControlPath /tmp/ssh_mux_%h_%p_%r - # ControlPersist 15m - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa - ProxyJump bastion-sjc.dropboxer.net - # Duo 2FA can count as part of this timeout, so make sure it's long enough. - ConnectTimeout 120 - -# US west-coast production shell servers -Host shelby camaro mustang - ProxyJump bastion-sjc.dropboxer.net - # Duo 2FA can count as part of this timeout, so make sure it's long enough. - ConnectTimeout 120 - # Global shell hosts isolate forwarded agents to your container, making - # agent forwarding relatively safe. - ForwardAgent yes - -# US east-coast production shell servers -Host viper - ProxyJump bastion-iad.dropboxer.net - # Duo 2FA can count as part of this timeout, so make sure it's long enough. - ConnectTimeout 120 - # Global shell hosts isolate forwarded agents to your container, making - # agent forwarding relatively safe. - ForwardAgent yes - -#### Place local modifications below this line #### - -Host * - AddKeysToAgent yes - -#### Place local modifications above this line #### - -Host * - Compression no - ConnectTimeout 5 - ForwardX11 no - GSSAPIAuthentication no - StrictHostKeyChecking no - TCPKeepAlive yes diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 7c9c877..26c3000 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -84,6 +84,7 @@ input type:touchpad { # Reload the configuration file bindsym $mod+Shift+c nop bindsym --release $mod+Shift+c reload + bindsym $mod+Shift+z sticky toggle # Exit sway (logs you out of your Wayland session) bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' @@ -213,7 +214,7 @@ input type:touchpad { ## Screengrabbing { # screenshot area - bindsym --release Print exec --no-startup-id grim -g "$(slurp)" - | wl-copy + bindsym --release Print exec --no-startup-id grim -g "$(slurp)" - | swappy -f - # } ## Brightness controls { @@ -221,7 +222,6 @@ input type:touchpad { bindsym XF86MonBrightnessDown exec --no-startup-id light -U 5 # } - ## Sound { bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -q sset Master 5%+ bindsym XF86AudioLowerVolume exec --no-startup-id amixer -q sset Master 5%- @@ -271,7 +271,9 @@ bindsym --whole-window --border $mod+shift+button5 gaps inner current plus 5 focus_follows_mouse no focus_wrapping workspace -font pango:TerminessTTF Nerd Font 14 +font pango:Iosevka 12 +titlebar_padding 1 +titlebar_border_thickness 0 exec --no-startup-id i3-rename-workspace exec --no-startup-id udiskie @@ -293,8 +295,9 @@ client.background $color7 title_align center -assign [class="zoom"] workspace number 4 +assign [class="zoom"] number 4 for_window [window_role="About"] floating enable +for_window [class="zoom" instance="^$"] floating enable # Make Authy a floating window for_window [title="^Authy$"] floating enable @@ -310,4 +313,8 @@ exec_always import-gsettings \ icon-theme:gtk-icon-theme-name \ cursor-theme:gtk-cursor-theme-name +seat * hide_cursor 5000 + +exec /usr/lib/xdg-desktop-portal -r + include /etc/sway/config.d/* diff --git a/systemd/.config/systemd/user/timers.target.wants/wal.timer b/systemd/.config/systemd/user/timers.target.wants/wal.timer deleted file mode 120000 index 3665fe1..0000000 --- a/systemd/.config/systemd/user/timers.target.wants/wal.timer +++ /dev/null @@ -1 +0,0 @@ -/home/luan/.config/systemd/user/wal.timer \ No newline at end of file diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config index 86bd265..e876c72 100644 --- a/waybar/.config/waybar/config +++ b/waybar/.config/waybar/config @@ -1,7 +1,7 @@ { "layer": "top", // Waybar at top layer // "position": "bottom", // Waybar position (top|bottom|left|right) - "height": 30, // Waybar height (to be removed for auto height) + "height": 40, // Waybar height (to be removed for auto height) // "width": 1280, // Waybar width // Choose the order of the modules "modules-left": [ @@ -56,7 +56,7 @@ } }, "tray": { - "icon-size": 18, + "icon-size": 24, "spacing": 10 }, "clock#date": { @@ -88,7 +88,7 @@ "tooltip-format": "{used:0.1f}G/{total:0.1f}G\n{avail:0.1f}G" // this doesn't work :( }, "temperature": { - // "thermal-zone": 2, + "thermal-zone": 10, // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", "critical-threshold": 80, // "format-critical": "{temperatureC}°C {icon}", @@ -133,6 +133,7 @@ ] }, "network#info": { + "interface": "wlp2s0", "interval": 1, "format-alt": "{ipaddr}/{cidr} {icon}", "format-icons": { @@ -186,13 +187,15 @@ "exec-if": "pgrep spotify" }, "custom/spotify#prev": { - "exec": "echo ; pkill -SIGRTMIN+8 waybar", + "exec": "echo ", "exec-if": "pgrep spotify", - "on-click": "playerctl previous" + "interval": 10, + "on-click": "playerctl previous; pkill -SIGRTMIN+8 waybar" }, "custom/spotify#next": { "exec": "echo ", "exec-if": "pgrep spotify", + "interval": 10, "on-click": "playerctl next; sleep 0.3; pkill -SIGRTMIN+8 waybar" }, "custom/spotify#play": { @@ -204,6 +207,7 @@ }, "custom/packages": { "format": "{icon} {}", + "interval": 60, "return-type": "json", "max-length": 40, "format-icons": { diff --git a/waybar/.config/waybar/packages.sh b/waybar/.config/waybar/packages.sh index 31d67dc..97cff90 100755 --- a/waybar/.config/waybar/packages.sh +++ b/waybar/.config/waybar/packages.sh @@ -1,16 +1,16 @@ #!/bin/bash count=0 -if command -v checkupdates; then +if command -v checkupdates >/dev/null 2>/dev/null; then count="$(checkupdates | wc -l)" else - sudo apt update + sudo apt update >/dev/null 2>/dev/null count="$(apt list --upgradable | grep -c upgradable)" fi if [ "$count" -gt 0 ]; then packages='' - if command -v checkupdates; then + if command -v checkupdates >/dev/null 2>/dev/null; then packages="$(checkupdates)" else packages="$(apt list --upgradable | grep upgradable | sed -e 's#\(.*\)/.*#\1#p' | sort -u)" diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css index b1e2ae7..f8829e8 100644 --- a/waybar/.config/waybar/style.css +++ b/waybar/.config/waybar/style.css @@ -5,13 +5,12 @@ border-radius: 0; font-family: "Roboto Mono", "Font Awesome 5 Free", "Font Awesome 5 Brands", "TerminessTTF Nerd Font", monospace; /* font-family: 'Iosevka Term', 'Font Awesome 5 Free', 'SFNS Display', Helvetica, Arial, sans-serif; */ - font-size: 12px; + font-size: 14px; min-height: 0; } -#clock span { - color: red; - font-size: 40px; +#clock { + font-size: 18px; } window#waybar { diff --git a/zsh/.zshrc b/zsh/.zshrc index 19aff6e..ed88e5a 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -120,3 +120,7 @@ if [ -f '/home/luan/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/luan/g export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" for c in $(ls --color=none $XDG_CONFIG_HOME/zsh/*.zsh); do source $c; done + +eval $(keychain --eval --dir $HOME/.config/keychain --quiet --noask --agents gpg,ssh id_rsa) + +[ -s "/home/luan/.scm_breeze/scm_breeze.sh" ] && source "/home/luan/.scm_breeze/scm_breeze.sh"