From 2ae09557fc81d668c70620ace7e2ee0670f97cef Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Thu, 25 Jan 2024 09:53:59 -0500 Subject: pre-upgrade --- .config/gtk-3.0/settings.ini | 3 - .config/rofi/config.rasi | 8 +-- .config/sway/config | 142 +++++++++++++++++++++++-------------------- .vim/spell/en.utf-8.add | 4 ++ .vim/spell/en.utf-8.add.spl | Bin 556 -> 633 bytes .zprofile | 2 +- 6 files changed, 84 insertions(+), 75 deletions(-) delete mode 100644 .config/gtk-3.0/settings.ini diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini deleted file mode 100644 index a640e84..0000000 --- a/.config/gtk-3.0/settings.ini +++ /dev/null @@ -1,3 +0,0 @@ -[Settings] -gtk-theme-name=FlatColor - diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi index 4d0eb3d..90b89fc 100644 --- a/.config/rofi/config.rasi +++ b/.config/rofi/config.rasi @@ -1,12 +1,14 @@ @theme "wpg" configuration { - modi: "combi,filebrowser,emoji"; + modi: "combi"; + combi-modi: "run,ssh,emoji,pass:rofi-pass.sh pass,otp:rofi-pass.sh otp"; + show-icons: true; + sidebar-mode: true; /* font: "mono 12";*/ /* location: 0;*/ /* yoffset: 0;*/ /* xoffset: 0;*/ /* fixed-num-lines: true;*/ - show-icons: true; /* terminal: "rofi-sensible-terminal";*/ /* ssh-client: "ssh";*/ /* ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]";*/ @@ -27,13 +29,11 @@ configuration { /* sorting-method: "normal";*/ /* case-sensitive: false;*/ /* cycle: true;*/ - sidebar-mode: true; /* hover-select: false;*/ /* eh: 1;*/ /* auto-select: false;*/ /* parse-hosts: false;*/ /* parse-known-hosts: true;*/ - combi-modi: "run,ssh"; /* matching: "normal";*/ /* tokenize: true;*/ /* m: "-5";*/ diff --git a/.config/sway/config b/.config/sway/config index ccb6f0b..4d20af6 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -42,30 +42,31 @@ workspace $ws9 output primary workspace $ws10 output primary # switch to workspace -bindsym Mod1+1 workspace $ws1 -bindsym Mod1+2 workspace $ws2 -bindsym Mod1+3 workspace $ws3 -bindsym Mod1+4 workspace $ws4 -bindsym Mod1+5 workspace $ws5 -bindsym Mod1+6 workspace $ws6 -bindsym Mod1+7 workspace $ws7 -bindsym Mod1+8 workspace $ws8 -bindsym Mod1+9 workspace $ws9 -bindsym Mod1+0 workspace $ws10 -bindsym Mod1+Tab workspace back_and_forth -bindsym Mod1+Shift+Tab exec rofi -show window +bindsym Mod4+1 workspace $ws1 +bindsym Mod4+2 workspace $ws2 +bindsym Mod4+3 workspace $ws3 +bindsym Mod4+4 workspace $ws4 +bindsym Mod4+5 workspace $ws5 +bindsym Mod4+6 workspace $ws6 +bindsym Mod4+7 workspace $ws7 +bindsym Mod4+8 workspace $ws8 +bindsym Mod4+9 workspace $ws9 +bindsym Mod4+0 workspace $ws10 +bindsym Mod4+Tab workspace next_on_output +bindsym Mod4+Shift+Tab workspace prev_on_output +workspace_auto_back_and_forth yes # move focused container to workspace -bindsym Mod1+shift+1 move container to workspace $ws1 -bindsym Mod1+shift+2 move container to workspace $ws2 -bindsym Mod1+shift+3 move container to workspace $ws3 -bindsym Mod1+shift+4 move container to workspace $ws4 -bindsym Mod1+shift+5 move container to workspace $ws5 -bindsym Mod1+shift+6 move container to workspace $ws6 -bindsym Mod1+shift+7 move container to workspace $ws7 -bindsym Mod1+shift+8 move container to workspace $ws8 -bindsym Mod1+shift+9 move container to workspace $ws9 -bindsym Mod1+shift+0 move container to workspace $ws10 +bindsym Mod4+shift+1 move container to workspace $ws1 +bindsym Mod4+shift+2 move container to workspace $ws2 +bindsym Mod4+shift+3 move container to workspace $ws3 +bindsym Mod4+shift+4 move container to workspace $ws4 +bindsym Mod4+shift+5 move container to workspace $ws5 +bindsym Mod4+shift+6 move container to workspace $ws6 +bindsym Mod4+shift+7 move container to workspace $ws7 +bindsym Mod4+shift+8 move container to workspace $ws8 +bindsym Mod4+shift+9 move container to workspace $ws9 +bindsym Mod4+shift+0 move container to workspace $ws10 # move workspaces between outputs on dock bindswitch --reload --locked lid:on output eDP-1 disable ; output DP-3 enable; @@ -76,9 +77,9 @@ bindswitch --reload --locked lid:off output eDP-1 enable ; output DP-3 disable; default_border pixel hide_edge_borders smart title_align center -floating_modifier Mod1 -bindsym Mod1+shift+p move scratchpad -bindsym Mod1+p scratchpad show +floating_modifier Mod4 +bindsym Mod4+shift+p move scratchpad +bindsym Mod4+p scratchpad show # movement set $down j @@ -87,65 +88,62 @@ set $right l set $up k # change focus -bindsym Mod1+$down focus down -bindsym Mod1+$left focus left -bindsym Mod1+$right focus right -bindsym Mod1+$up focus up -bindsym Mod1+space focus mode_toggle +bindsym Mod4+$down focus down +bindsym Mod4+$left focus left +bindsym Mod4+$right focus right +bindsym Mod4+$up focus up # move focused window -bindsym Mod1+shift+$down move down -bindsym Mod1+shift+$left move left -bindsym Mod1+shift+$right move right -bindsym Mod1+shift+$up move up +bindsym Mod4+shift+$down move down +bindsym Mod4+shift+$left move left +bindsym Mod4+shift+$right move right +bindsym Mod4+shift+$up move up # resize -bindsym Mod1+i resize grow height -bindsym Mod1+o resize grow width -bindsym Mod1+u resize shrink height -bindsym Mod1+y resize shrink width +bindsym Mod4+i resize grow height +bindsym Mod4+o resize grow width +bindsym Mod4+u resize shrink height +bindsym Mod4+y resize shrink width ## LAYOUT -bindsym Mod1+f fullscreen toggle -bindsym Mod1+shift+space floating toggle -bindsym Mod1+shift+s floating enable; sticky toggle +bindsym Mod4+f fullscreen toggle +bindsym Mod4+shift+space floating toggle +bindsym Mod4+shift+s floating enable; sticky toggle ## CONTROLS -bindsym Mod1+shift+q kill -bindsym Mod1+shift+e exit -bindsym Mod1+shift+c reload -#bindsym Mod1+shift+r restart +bindsym Mod4+q kill +bindsym Mod4+shift+r reload ## SHORTCUTS -bindsym Mod1+Return split horizontal; exec $term -bindsym Mod1+shift+Return split vertical; exec $term -bindsym Mod1+control+Return split horizontal; exec $term -e mosh dev.53hor.net -bindsym Mod1+control+shift+Return split vertical; exec $term -e mosh dev.53hor.net +bindsym Mod4+Return split horizontal; exec $term +bindsym Mod4+shift+Return split vertical; exec $term +bindsym Mod4+control+Return split horizontal; exec $term -e mosh dev.53hor.net +bindsym Mod4+control+shift+Return split vertical; exec $term -e mosh dev.53hor.net #bindsym Mod4+p exec arandr #bindsym Mod4+l exec xautolock -locknow -bindsym Mod1+F1 exec rofi -show combi -bindsym Mod1+F2 workspace $ws1 ; exec firefox -bindsym Mod1+F3 exec exec thunderbird -bindsym Mod1+F4 exec passmenu.sh -#bindsym Mod1+F5 exec -#bindsym Mod1+F1 exec -#bindsym Mod1+F1 exec -#bindsym Mod1+F1 exec -#bindsym Mod1+F6 exec -#bindsym Mod1+F7 exec -#bindsym Mod1+F8 exec -#bindsym Mod1+F9 exec passmenu.sh -bindsym Mod1+F10 exec mixer vol -5 && $sigaudio -bindsym Mod1+F11 exec mixer vol +5 && $sigaudio -bindsym Mod1+F12 exec mixer vol 0 && $sigaudio +bindsym Mod4+space exec rofi -show combi +bindsym Mod4+F2 workspace $ws1 ; exec firefox +bindsym Mod4+F3 exec thunderbird +#bindsym Mod4+F4 exec passmenu.sh +#bindsym Mod4+F5 exec +#bindsym Mod4+F1 exec +#bindsym Mod4+F1 exec +#bindsym Mod4+F1 exec +#bindsym Mod4+F6 exec +#bindsym Mod4+F7 exec +#bindsym Mod4+F8 exec +#bindsym Mod4+F9 exec passmenu.sh +bindsym Mod4+F10 exec mixer vol 0 && $sigaudio +bindsym Mod4+F11 exec mixer vol -5 && $sigaudio +bindsym Mod4+F12 exec mixer vol +5 && $sigaudio bindsym XF86AudioLowerVolume exec mixer vol -5 && $sigaudio bindsym XF86AudioRaiseVolume exec mixer vol +5 && $sigaudio bindsym XF86AudioMute exec mixer vol 0 && $sigaudio bindsym --release Print exec grim -bindsym Mod1+Pause exec swaylock ; exec doas acpiconf -s3 +bindsym Mod4+Pause exec swaylock ; exec doas acpiconf -s3 ## COLORS @@ -171,12 +169,21 @@ mode $mode_record { } set $mode_modes "󱊷 default 󱊫 recording" -bindsym Mod1+Escape mode $mode_modes +bindsym Mod4+Escape mode $mode_modes mode $mode_modes { bindsym Escape mode default bindsym F1 mode $mode_record } +set $mode_quit "Really quit? (y/N)" +mode $mode_quit { + bindsym y exit + bindsym Return mode default + bindsym n mode default + bindsym Escape mode default +} +bindsym Mod4+shift+q mode $mode_quit + ## ASSIGNMENTS assign [class="Firefox"] $ws1 @@ -185,4 +192,5 @@ for_window [class="pwcview"] floating enable ; sticky enable for_window [title="wpgtk*"] floating enable ## STARTUP -exec_always sh /home/atc/.config/wpg/wp-init.sh +exec_always ~/.config/wpg/wp_init.sh +exec swayidle -w timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add index c0abba3..da8bfd1 100644 --- a/.vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -33,3 +33,7 @@ Squarespace carpentertutoring Quickstart Whitespace +workstream +Kubernetes +MySQL +Symfony diff --git a/.vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl index ac78f0b..072f851 100644 Binary files a/.vim/spell/en.utf-8.add.spl and b/.vim/spell/en.utf-8.add.spl differ diff --git a/.zprofile b/.zprofile index 4542f8f..05be15f 100644 --- a/.zprofile +++ b/.zprofile @@ -3,4 +3,4 @@ export XDG_RUNTIME_DIR=/var/run/user/`id -u` \ MOZ_ENABLE_WAYLAND=1 \ GDK_BACKEND=wayland \ MOZ_DBUS_REMOTE=1 -[ -z $DISPLAY ] && [ $(tty) = /dev/ttyv0 ] && exec sway > /var/log/sway.log +#[ -z $DISPLAY ] && [ $(tty) = /dev/ttyv0 ] && exec sway > /var/log/sway.log -- cgit v1.2.3