From 81f924ea8733c1151d097583faf5e8af037a282c Mon Sep 17 00:00:00 2001 From: James Gillman Date: Tue, 9 Jan 2024 16:26:43 -0600 Subject: [PATCH] fixes, remove i3lock, I just use xlock --- .fvwmrc | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 6 +- Xsetup_0 | 7 +- helpers.rc | 1 + install.sh | 19 +++-- 5 files changed, 232 insertions(+), 12 deletions(-) create mode 100644 .fvwmrc create mode 100644 helpers.rc diff --git a/.fvwmrc b/.fvwmrc new file mode 100644 index 0000000..f462fe9 --- /dev/null +++ b/.fvwmrc @@ -0,0 +1,211 @@ +ModulePath /usr/X11R6/lib/X11/fvwm + +########################### +# General configurations. # +########################### +EdgeResistance 250 10 +EdgeScroll 0 0 +ClickTime 750 + +DeskTopSize 3x3 +ColormapFocus FollowsMouse + +#################################### +# Window style and configurations. # +# https://www.w3schools.com/colors/colors_palettes.asp 2017 Pallettes, bottom right # +#################################### +HilightColor #ffffff #405d27 +MenuStyle #ffffff #405d27 #1e1e1e fixed fvwm + +Style "*" BorderWidth 5, HandleWidth 5 +Style "*" Color #ffffff/#3e4444 +Style "*" FocusFollowsMouse +Style "*" RandomPlacement, SmartPlacement + +Style "Fvwm*" NoTitle, Sticky, WindowListSkip + +############################# +# Initialization functions. # +############################# +AddToFunc InitFunction "I" Module FvwmPager 0 0 ++ "I" exec feh --bg-fill ~/.config/images/wallpaper.png +AddToFunc RestartFunction "I" Module FvwmPager 0 0 ++ "I" exec feh --bg-fill ~/.config/images/wallpaper.png + +########## +# Pager. # +########## +*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* +*FvwmPagerBack black +*FvwmPagerFore white +*FvwmPagerHilight #2d2d2d +*FvwmPagerGeometry 100x100-1-1 +*FvwmPagerLabel 0 "OpenBSD" +*FvwmPagerSmallFont 5x8 + +########## +# Menus. # +########## +AddToMenu RootMenu "OpenBSD" Title ++ "XTerm" exec xterm -e '/usr/local/bin/fish' ++ "Dev Folder" exec xterm -e 'cd ./dev/ && /usr/local/bin/fish' ++ "Ports Folder" exec xterm -e 'cd /usr/ports/ && /usr/local/bin/fish' ++ "" Nop ++ "Chromium" exec chrome ++ "File Manager" exec thunar ++ "Volume" Popup VolumeMenu ++ "" Nop ++ "Utilities" Popup UtilitiesMenu ++ "" Nop ++ "Restart FVWM" Restart fvwm ++ "Lock screen" exec xlock ++ "Logout" FvwmForm QuitVerify ++ "Reboot" FvwmForm RebootVerify ++ "Shutdown" FvwmForm ShutdownVerify + +# Window operations for the centre mouse button. +AddToMenu Global-Window-Ops "Window Ops" Title ++ "Move" Move-or-Raise2 ++ "Resize" Resize-or-Raise2 ++ "Raise" Raise ++ "Lower" Lower ++ "(De)Iconify" Iconify ++ "(Un)Stick" Stick ++ "(Un)Maximize" maximize_func ++ "" Nop ++ "Delete" Delete ++ "Close" Close ++ "Destroy" Destroy ++ "" Nop ++ "Refresh Screen" Refresh + +# Window operations for the top left of every window. +AddToMenu Window-Ops "Move" Move-or-Raise ++ "Resize" Resize-or-Raise ++ "Raise/Lower" RaiseLower ++ "Iconify" Iconify ++ "(Un)Stick" Stick ++ "" Nop ++ "Delete" Delete ++ "Close" Close ++ "Destroy" Destroy + +# Utilities Menu. +AddToMenu UtilitiesMenu "Utilities" Title ++ "About System" exec xterm -hold neofetch ++ "ARandR" exec arandr ++ "Calculator" exec xcalc ++ "Screenshot" exec scrot -s ++ + +# Volume menu. +AddToMenu VolumeMenu "Volume Control" Title ++ "Mute" exec sndioctl output.mute=! ++ "Volume 100%%" exec sndioctl output.level=1 ++ "Volume 90%%" exec sndioctl output.level=.9 ++ "Volume 80%%" exec sndioctl output.level=.8 ++ "Volume 70%%" exec sndioctl output.level=.7 ++ "Volume 60%%" exec sndioctl output.level=.6 ++ "Volume 50%%" exec sndioctl output.level=.5 ++ "Volume 40%%" exec sndioctl output.level=.4 ++ "Volume 30%%" exec sndioctl output.level=.3 ++ "Volume 20%%" exec sndioctl output.level=.2 ++ "Volume 10%%" exec sndioctl output.level=.1 ++ "Volume 0%%" exec sndioctl output.level=0 + +######################### +# Mouse configurations. # +######################### +# Button Context Modifi Function +Mouse 1 R A Menu RootMenu Nop +Mouse 2 R A Menu Global-Window-Ops Nop +Mouse 3 R A WindowList + +# Title bar options (minimise, maximise, close). +# Button Context Modifi Function +Mouse 0 1 A Menu Window-Ops Close +Mouse 0 2 A Close +Mouse 0 4 A Maximize-Func +Mouse 0 6 A Iconify + +# Button 1 configurations for frame/sides, icons, and on top. +# Button Context Modifi Function +Mouse 1 FS A Resize-or-Raise +Mouse 1 I A Move-or-Iconify +Mouse 1 T A Move-or-Raise + +# Button 2 configuration. +Mouse 2 FST A Menu Window-Ops Nop + +############## +# Functions. # +############## +AddToFunc Move-or-Raise "I" Raise ++ "M" Move ++ "D" Maximize + +AddToFunc Move-or-Raise2 "M" Raise ++ "M" Move ++ "D" Lower + +AddToFunc Maximize-Func "C" Maximize 100 100 + +AddToFunc Move-or-Iconify "I" Raise ++ "M" Move ++ "D" Iconify + +AddToFunc Resize-or-Raise "I" Raise ++ "M" Resize ++ "D" Lower + +AddToFunc Resize-or-Raise2 "M" Raise ++ "M" Resize ++ "D" Lower + +AddToFunc Iconify-and-Raise "I" Iconify ++ "I" Raise + +####################### +# Keyboard shortcuts. # +####################### + +# to do... + +######################################################## +# Confirmation pages for logout, reboot, and shutdown. # +######################################################## +*QuitVerifyGrabServer +*QuitVerifyWarpPointer +*QuitVerifyCommand Beep +*QuitVerifyLine center +*QuitVerifyText "Do you really want to logout?" +*QuitVerifyLine expand +*QuitVerifyButton quit "Logout" ^M +*QuitVerifyCommand Quit +*QuitVerifyButton quit "Cancel" ^[ +*QuitVerifyCommand Nop +Style "QuitVerify" NoTitle, NoHandles, BorderWidth 3 + +*RebootVerifyGrabServer +*RebootVerifyWarpPointer +*RebootVerifyCommand Beep +*RebootVerifyLine center +*RebootVerifyText "Do you really want to reboot?" +*RebootVerifyLine expand +*RebootVerifyButton quit "Reboot" ^M +*RebootVerifyCommand exec /usr/bin/doas /sbin/reboot +*RebootVerifyButton quit "Cancel" ^[ +*RebootVerifyCommand Nop +Style "RebootVerify" NoTitle, NoHandles, BorderWidth 3 + +*ShutdownVerifyGrabServer +*ShutdownVerifyWarpPointer +*ShutdownVerifyCommand Beep +*ShutdownVerifyLine center +*ShutdownVerifyText "Do you really want to shutdown?" +*ShutdownVerifyLine expand +*ShutdownVerifyButton quit "Shutdown" ^M +*ShutdownVerifyCommand exec /usr/bin/doas /sbin/shutdown -hp now +*ShutdownVerifyButton quit "Cancel" ^[ +*ShutdownVerifyCommand Nop +Style "ShutdownVerify" NoTitle, NoHandles, BorderWidth 3 diff --git a/README.md b/README.md index 668cef8..303de3b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# OpenBSD-Bootstrap +# dotfiles -My OpenBSD dotfiles and configuration. -Shamelessly stolen and heavily modifed from: https://www.github.com/crhenr/dotfiles +My OpenBSD dotfiles. +Shamelessly stolen and modifed from: https://www.github.com/crhenr/dotfiles ## How to install diff --git a/Xsetup_0 b/Xsetup_0 index fe0ede1..ee85cd8 100755 --- a/Xsetup_0 +++ b/Xsetup_0 @@ -4,7 +4,7 @@ prefix="/usr/X11R6" exec_prefix="${prefix}" -${exec_prefix}/bin/xsetroot -fg \#6f6f6f -bg \#bfbfbf -bitmap ${prefix}/include/X11/bitmaps/root_weave +${exec_prefix}/bin/xsetroot -bg \#1e1e1e -fg \#1e1e1e xsetroot -bg \#222229 -fg \#115522 -mod 16 16 @@ -13,4 +13,9 @@ xsetroot -bg \#222229 -fg \#115522 -mod 16 16 # install package openbsd-backgrounds # then uncomment: # +# if test -x /usr/local/bin/openbsd-wallpaper +# then +# /usr/local/bin/openbsd-wallpaper +# fi + # sxpm OpenBSD.xpm & diff --git a/helpers.rc b/helpers.rc new file mode 100644 index 0000000..563cb94 --- /dev/null +++ b/helpers.rc @@ -0,0 +1 @@ +TerminalEmulator=xterm diff --git a/install.sh b/install.sh index f3e6c11..3ac291c 100755 --- a/install.sh +++ b/install.sh @@ -4,18 +4,23 @@ echo -n "Move dotfiles to which user? " read user echo "[*] Installing necessary software..." -pkg_add feh i3lock scrot ImageMagick vim thunar chromium neofetch arandr ruby ruby-shims fish jdk portslist unzip +pkg_add wget feh scrot ImageMagick vim thunar chromium neofetch arandr ruby ruby-shims fish jdk portslist unzip -echo "[*] Copying dotfiles..." +echo "[*] Copying dotfiles, config files, etc..." cp .fvwmrc /home/$user/.fvwmrc cp .vimrc /home/$user/.vimrc cp .Xdefaults /home/$user/.Xdefaults -mv .config /home/$user/ +mkdir /home/$user/.config/images +cp ./openbsd-dark/background.png /home/$user/.config/images/wallpaper.png +cp helpers.rc /home/$user/.config/xfce4/helpers.rc echo "exec fvwm" >> /home/$user/.xinitrc -echo "[*] Make Dev folder" +echo "[*] Make folders for Home folder" mkdir /home/$user/dev +mkdir /home/$user/Documents +mkdir /home/$user/Pictures +mkdir /home/$user/Music echo "[*] Chown -R Home Folder" chown -R $user /home/$user @@ -41,13 +46,11 @@ echo "[*] Configure Memory Limits for Programs" usermod -G staff $user cp -f ./login.conf /etc/login.conf -echo [*] Configure xenodm +echo "[*] Disable XConsole, XenoDM colors" cp -f ./Xsetup_0 /etc/X11/xenodm/Xsetup_0 - - echo "[*] Run Syspatch" syspatch -echo "[*] Done." +echo "Done! Please Reboot!" neofetch