From 3add4cebbd210a5874f7a07f71da25cb703373f1 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sun, 1 Nov 2020 19:12:11 -0600 Subject: [PATCH] Updates --- apps/de/gnome/gdm-tap-to-click | 2 + apps/de/sway/config | 104 ++++++++---------- apps/de/sway/dm-entry | 6 +- apps/de/sway/init | 24 +--- apps/kitty/kitty.conf | 1 + apps/neovim/plugins.vim | 2 +- apps/udev-rules/gcadapter | 1 + bin/archupdate | 2 +- .../arch-linux/provisioning/0-adduser.bash | 22 ++-- .../arch-linux/provisioning/2-essentials.bash | 58 ++-------- bin/lib/arch-linux/provisioning/3-extras.bash | 31 ++---- bin/lib/arch-linux/provisioning/4-comms.bash | 3 +- bin/lib/arch-linux/provisioning/amd.bash | 6 +- bin/lib/arch-linux/provisioning/irc.bash | 4 - bin/lib/arch-linux/provisioning/nvidia.bash | 8 -- .../arch-linux/provisioning/tmux-plugins.bash | 4 - bin/lib/sudo_setup | 5 +- bofa.json | 28 ----- env/desktop/bin/minecraft | 3 + env/desktop/sway/config.d/main | 6 +- 20 files changed, 101 insertions(+), 219 deletions(-) create mode 100644 apps/de/gnome/gdm-tap-to-click create mode 100644 apps/udev-rules/gcadapter delete mode 100755 bin/lib/arch-linux/provisioning/irc.bash delete mode 100755 bin/lib/arch-linux/provisioning/nvidia.bash delete mode 100644 bofa.json create mode 100755 env/desktop/bin/minecraft diff --git a/apps/de/gnome/gdm-tap-to-click b/apps/de/gnome/gdm-tap-to-click new file mode 100644 index 0000000..72eb2cd --- /dev/null +++ b/apps/de/gnome/gdm-tap-to-click @@ -0,0 +1,2 @@ +[org/gnome/desktop/peripherals/touchpad] +tap-to-click=true diff --git a/apps/de/sway/config b/apps/de/sway/config index 77fb313..40fc3c8 100644 --- a/apps/de/sway/config +++ b/apps/de/sway/config @@ -4,35 +4,32 @@ # + Super+Control+{1-9} should control the size of the preselect space. # + Super+Shift+b should balance the size of all selected nodes. +set $mod Mod4 set $default_gap 0 -set $left h -set $down j -set $up k -set $right l -set $term term -set $fterm floating-term -set $menu app-launcher -set $fileexplorer thunar - -output * bg $HOME/.wallpaper fill focus_wrapping no gaps inner $default_gap smart_borders on|no_gaps hide_edge_borders smart_no_gaps -set $mod Mod4 +default_border pixel 5 +focus_follows_mouse no + +input type:keyboard { + repeat_delay 200 + repeat_rate 60 +} bindsym Control+Space exec makoctl dismiss # bindsym $mod+Control+Space exec makoctl invoke -bindsym $mod+Return exec $term -bindsym $mod+shift+Return exec $fterm -bindsym $mod+t exec $term +bindsym $mod+Return exec term +bindsym $mod+shift+Return exec floating-term +bindsym $mod+t exec term bindsym $mod+Alt+Return exec urxvt bindsym $mod+Shift+Alt+Return exec kitty bindsym $mod+c kill bindsym $mod+Shift+c kill # TODO: kill -9? -bindsym $mod+Space exec $menu -bindsym $mod+e exec $fileexplorer +bindsym $mod+Space exec app-launcher +bindsym $mod+e exec thunar bindsym $mod+Shift+r reload bindsym $mod+Control+Escape exit bindsym $mod+Shift+e exit @@ -41,20 +38,20 @@ bindsym $mod+Control+j split v bindsym $mod+Control+l split h bindsym $mod+Control+f focus mode_toggle -bindsym $mod+$left focus left -bindsym $mod+$down focus down -bindsym $mod+$up focus up -bindsym $mod+$right focus right +bindsym $mod+h focus left +bindsym $mod+j focus down +bindsym $mod+k focus up +bindsym $mod+l focus right bindsym $mod+Left focus left bindsym $mod+Down focus down bindsym $mod+Up focus up bindsym $mod+Right focus right -bindsym $mod+Shift+$left move left -bindsym $mod+Shift+$down move down -bindsym $mod+Shift+$up move up -bindsym $mod+Shift+$right move right +bindsym $mod+Shift+h move left +bindsym $mod+Shift+j move down +bindsym $mod+Shift+k move up +bindsym $mod+Shift+l move right bindsym $mod+Shift+Left move left bindsym $mod+Shift+Down move down @@ -97,18 +94,6 @@ bindsym $mod+period focus child bindsym $mod+comma focus child bindsym $mod+tab workspace back_and_forth -bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% -bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% -bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle -bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle -bindsym XF86MonBrightnessDown exec brightnessctl set 5%- -bindsym XF86MonBrightnessUp exec brightnessctl set +5% -bindsym XF86AudioPlay exec playerctl play-pause -bindsym XF86AudioNext exec playerctl next -bindsym XF86AudioPrev exec playerctl previous - -bindsym $mod+Shift+v exec pactl set-source-mute @DEFAULT_SOURCE@ toggle - bindsym $mod+minus gaps inner current minus 5 bindsym $mod+plus gaps inner current plus 5 bindsym $mod+Control+Alt+h gaps horizontal current minus 5 @@ -118,16 +103,27 @@ bindsym $mod+Control+Alt+k gaps vertical current plus 5 # TODO: this should also reset the horizontal and vertical gaps? bindsym $mod+Control+equal gaps inner current set $default_gap +bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% +bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% +bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle +bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle +bindsym XF86MonBrightnessDown exec brightnessctl set 5%- +bindsym XF86MonBrightnessUp exec brightnessctl set +5% +bindsym XF86AudioPlay exec playerctl play-pause +bindsym XF86AudioNext exec playerctl next +bindsym XF86AudioPrev exec playerctl previous +bindsym $mod+Shift+v exec pactl set-source-mute @DEFAULT_SOURCE@ toggle + bindsym $mod+Control+Shift+l exec swaylock -# TODO: toggle-able swayidle? -# TODO: one-time swayidle? +# TODO: toggle-able swayidle? does the idle thing in waybar handle this? +# TODO: one-time swayidle/monitor-off # bindsym $mod+Control+Shift+s exec lock-and-disable-monitors mode "resize" { - bindsym $left resize shrink width 10 px or 10 ppt - bindsym $down resize grow height 10 px or 10 ppt - bindsym $up resize shrink height 10 px or 10 ppt - bindsym $right resize grow width 10 px or 10 ppt + bindsym h resize shrink width 10 px or 10 ppt + bindsym j resize grow height 10 px or 10 ppt + bindsym k resize shrink height 10 px or 10 ppt + bindsym l resize grow width 10 px or 10 ppt bindsym Left resize shrink width 10 px or 10 ppt bindsym Down resize grow height 10 px or 10 ppt @@ -138,32 +134,22 @@ mode "resize" { bindsym Escape mode "default" } -default_border pixel 5 for_window [app_id="floating_terminal"] floating enable for_window [class="floating_terminal"] floating enable for_window [class=".*"] layout splitv -# bindsym $mod+r mode "resize" - -bar { - swaybar_command waybar -} - -input * { - repeat_delay 200 - repeat_rate 60 -} - -focus_follows_mouse no +output * bg $HOME/.wallpaper fill client.focused #66d9ef #66d9ef #66d9ef #66d9ef #66d9ef client.focused_inactive #111111 #111111 #ffffff #111111 #111111 client.unfocused #111111 #111111 #ffffff #111111 #111111 +bar { + swaybar_command waybar +} + exec mako -exec_always makoctl reload -exec_always notify-send -a "Sway" -i ~/.wallpaper "Sway configuration loaded." exec_always kanshi +exec_always notify-send -a "Sway" -i ~/.wallpaper "Sway configuration loaded." -include $ENV_PATH/sway/config.d/* - +include $ENV_PATH/sway/config.d/main diff --git a/apps/de/sway/dm-entry b/apps/de/sway/dm-entry index 78f99fd..6dee0f5 100644 --- a/apps/de/sway/dm-entry +++ b/apps/de/sway/dm-entry @@ -1,6 +1,6 @@ [Desktop Entry] -Version=1.0 Name=sway-lytedev -Comment=SirCmpwn's Wayland window manager with lytedev's config -Exec=/usr/bin/sway-lytedev +Comment=Sway with lytedev's config +Exec=sway-lytedev Type=Application +X-GDM-Session-Type=wayland diff --git a/apps/de/sway/init b/apps/de/sway/init index 3ac04c8..26c763f 100755 --- a/apps/de/sway/init +++ b/apps/de/sway/init @@ -5,30 +5,8 @@ . "$DOTFILES_PATH/bin/prelude" -# killall -9 dunst &> /dev/null -# killall -9 urxvtd -# urxvtd & - -# key repeat -export WLC_REPEAT_DELAY=200 -export WLC_REPEAT_RATE=60 - -# caps lock -> escape key mapping -# export XKB_DEFAULT_OPTIONS=caps:escape - -# enable wayland support for some applications export CLUTTER_BACKEND=wayland export SDL_VIDEODRIVER=wayland export MOZ_ENABLE_WAYLAND=1 -# export GDK_BACKEND=wayland -# export QT_QPA_PLATFORM=wayland-egl -# configuration flag for some of my dotfiles scripts -export IS_WAYLAND=1 - -sway - -# mako & -# has_command libinput-gestures-setup && libinput-gestures-setup start -# has_command kdeconnect-indicator && kdeconnect-indicator & -# has_command gnome-keyring-daemon && eval "$(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)" +exec sway diff --git a/apps/kitty/kitty.conf b/apps/kitty/kitty.conf index d8f9366..1e96444 100644 --- a/apps/kitty/kitty.conf +++ b/apps/kitty/kitty.conf @@ -4,6 +4,7 @@ repaint_delay 5 input_delay 1 sync_to_monitor no +disable_ligatures always # font_features Iosevka Fixed SS07 Medium -liga -dlig -calt font_size 11.0 diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim index 852873b..25abf6f 100644 --- a/apps/neovim/plugins.vim +++ b/apps/neovim/plugins.vim @@ -56,7 +56,7 @@ Plug 'junegunn/fzf.vim' " helpers for us Plug 'vim-airline/vim-airline' " status line Plug 'vim-airline/vim-airline-themes' " more minimal status line Plug 'nathanaelkane/vim-indent-guides' " indentation guides -Plug 'SirVer/ultisnips' " snippet manager +" Plug 'SirVer/ultisnips' " snippet manager Plug 'bkad/CamelCaseMotion' " camel case and underscore word movements Plug 'vim-scripts/LargeFile' " gracefully handle very large files Plug 'tpope/vim-commentary' " toggle comments in code easily diff --git a/apps/udev-rules/gcadapter b/apps/udev-rules/gcadapter new file mode 100644 index 0000000..afd1e49 --- /dev/null +++ b/apps/udev-rules/gcadapter @@ -0,0 +1 @@ +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="0337", MODE="0666" diff --git a/bin/archupdate b/bin/archupdate index 2374972..ec3c4b5 100755 --- a/bin/archupdate +++ b/bin/archupdate @@ -1,6 +1,6 @@ #!/usr/bin/env bash -pacaur -Syu --noconfirm --noedit +yay -Syu --nodiffmenu --nocleanmenu --noeditmenu # TODO: update kernel with a flag? # yes | pacman -Syu && kexec -l --initrd=/boot/initramfs-linux.img /boot/vmlinuz-linux && kexec -e diff --git a/bin/lib/arch-linux/provisioning/0-adduser.bash b/bin/lib/arch-linux/provisioning/0-adduser.bash index de57b29..f6866f9 100755 --- a/bin/lib/arch-linux/provisioning/0-adduser.bash +++ b/bin/lib/arch-linux/provisioning/0-adduser.bash @@ -1,21 +1,15 @@ #!/usr/bin/env bash -# user's username USERNAME=daniel -USER_GROUPS="admin,users" +GROUPS="admin,users" -# add admin group groupadd admin 2>/dev/null - -# create actual home directory -mkdir -p "/home/$USERNAME/.home" - -# add user with groups -useradd -m -d "/home/$USERNAME/.home" -G "${USER_GROUPS}" -s "/bin/bash" "$USERNAME" - -# give home directory ownership -chown -R "$USERNAME:$USERNAME" "/home/$USERNAME" - -# have user set new user's password +mkdir --parents "/home/$USERNAME/.home" +mkdir --parents "/home/$USERNAME/dl" +useradd --home-dir "/home/$USERNAME/.home" \ + --groups "${GROUPS}" \ + --shell "/bin/bash" \ + "$USERNAME" +chown --recursive "$USERNAME:$USERNAME" "/home/$USERNAME" echo "Setting password for user '$USERNAME'" passwd "$USERNAME" diff --git a/bin/lib/arch-linux/provisioning/2-essentials.bash b/bin/lib/arch-linux/provisioning/2-essentials.bash index 4d06254..b98a9ac 100755 --- a/bin/lib/arch-linux/provisioning/2-essentials.bash +++ b/bin/lib/arch-linux/provisioning/2-essentials.bash @@ -1,11 +1,10 @@ #!/usr/bin/env sh -pacaur --needed -S \ - neomutt `# Email Client` \ +yay -S \ weechat `# IRC Client` \ aria2 `# Downloads Manager` \ tree `# Handy Filesystem Viewing Utility` \ - dmenu rofi `# Application Launcher` \ + dmenu `# Application Launcher` \ ripgrep `# Code Search Utilities` \ fd `# File Search` \ sd `# Easy Find/Replace` \ @@ -13,9 +12,7 @@ pacaur --needed -S \ htop `# Process Management and System Resources Monitoring` \ openssh mosh `# Remote Access` \ openssl `# Crypto` \ - erlang elixir `# Elixir Language` \ asdf-vm `# Runtime Version Manager` \ - nodejs npm yarn `# JavaScript Runtime` \ python python-pip `# Python 3 Language` \ pass `# Password Management` \ firefox-developer-edition `# Default Web Browser` \ @@ -23,63 +20,28 @@ pacaur --needed -S \ alsa-utils `# Audio Utilities` \ alsa-plugins `# Plugins for ALSA` \ pulseaudio pavucontrol pulsemixer `# Audio Backend and Controls` \ - pulseaudio-ctl `# CLI Utility for Pulseaudio` \ - neovim vim `# Text Editors` \ + neovim `# Text Editors` \ unzip `# Simple Unzipping` \ - xclip xsel `# X Selection & Clipboard Management` \ - autocutsel `# Clipboard Helper` \ tmux `# Terminal Multiplexer` \ - rxvt-unicode-pixbuf `# Terminal with PixBuf Patches` \ kitty `# Almost Better Terminal Emulator` \ - xorg-xinit xorg-server xorg-xrdb `# X Display Server` \ - xorg-drivers `# Video Drivers for X` \ - xcb-util xcb-util-keysyms xcb-util-wm xorg-xrandr xdotool xorg-xprop `# X Utilties` \ feh `# Image Viewer & Wallpaper Manager` \ - unclutter-xfixes-git `# Hides cursor after no use for a time` \ - gtk-engine-murrine xorg-server-devel `# GTK Theme Base and Headers?` \ - bspwm-git sxhkd-git xdo-git `# Window Manager and Tools for its use` \ wlroots-git sway-git `# Wayland Compositor` \ - swaylock `# Wayland Compositor` \ - kanshi `# Monitor Management for Wayland` \ - waybar mako `# Wayland Bar & Notifications` \ + swaylock-git `# Wayland Compositor` \ + kanshi-git `# Monitor Management for Wayland` \ + waybar-git mako-git `# Wayland Bar & Notifications` \ slurp grim wl-clipboard `# Wayland Screen Selection & Clipping` \ - wl-clipboard `# Wayland Clipboard CLI` \ - terminus-font ttf-iosevka-type ttf-iosevka-term `# Primary Fonts` \ + ttf-iosevka `# Primary Fonts` \ ttf-font-awesome `# Icon Font` \ curl `# HTTP Utility` \ w3m `# Viewing Images in Terminals` \ jq `# CLI for Interacting with JSON` \ ranger `# CLI File Manager` \ - bash-completion `# Handy Scripts for Tab-Completion in Bash` \ - python-neovim python-jedi python-mistune python-psutil python-setproctitle httpie `# httpie and neovim dependencies` \ + httpie `# httpie and neovim dependencies` \ docker docker-compose `# Yummy containers` \ inotify-tools `# Watching` \ - luajit lua luarocks `# Lua` \ fish `# Shell` \ - pkgfile `# Package File Metadata` \ - swaks `# SMTP CLI` \ time `# GNU time` \ fortune-mod fortune-mod-archlinux `# Fortune` \ diff-so-fancy `# Fancy Diffs` \ - oath-toolkig `# One-Time Passwords` \ - sysstat `# System Statistics` \ - --noconfirm --noedit - -# install rxvt-unicode script for resizing font on-the-fly -mkdir -p "$HOME/.urxvt/ext" -curl -L -o "$HOME/.urxvt/ext/resize-font" https://raw.githubusercontent.com/lytedev/urxvt-resize-font/master/resize-font - -# install our font (customized iosevka from https://github.com/lytedev/iosevka) -( - curl -L -o "$HOME/font.tar.zstd" https://lyte.dev/uploads/lyte-font.tar.zstd - mkdir "$HOME/.fonts" - cd "$HOME/.fonts" || return - tar --zstd -xvf "$HOME/font.tar.zstd" - rm "$HOME/font.tar.zstd" - fc-cache -f -) - -# helpful Lua libs -echo "fun moonscript lpeg alt-getopt luafilesystem" | tr ' ' "\n" | xargs -I % sudo luarocks install % - -# TODO: recommend systemd services? + oath-toolkit `# One-Time Passwords` \ + sysstat `# System Statistics` diff --git a/bin/lib/arch-linux/provisioning/3-extras.bash b/bin/lib/arch-linux/provisioning/3-extras.bash index 2021900..b7fc06f 100755 --- a/bin/lib/arch-linux/provisioning/3-extras.bash +++ b/bin/lib/arch-linux/provisioning/3-extras.bash @@ -5,11 +5,12 @@ if egrep -q '^\[multilib\]$' /etc/pacman.conf; then else echo "Enabling Multilib Repository (with sudo)..." sudo sh -c 'echo -e "\n\n[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf' - pacaur -Syy + yay -Sy fi -pacaur --needed -S \ - bluez bluez-libs bluez-utils bluez-tools \ +yay -S \ + xf86-input-libinput \ + bluez bluez-libs bluez-utils bluez-tools `# Bluetooth` \ pigz `# Multi-core gzipping` \ iw `# WiFi Power Saving` \ arc-gtk-theme `# GTK Theme` \ @@ -23,36 +24,26 @@ pacaur --needed -S \ gimp inkscape krita `# Image/Vector Editing Applications` \ audacity `# Audio Editing Application` \ cmake `# Cross-Platform Make` \ - accountsservice `# Mainly for User Avatars with LightDM` \ + accountsservice `# Mainly for User Avatars with Display Manager` \ + gdm `# Display Manager of choice` \ deluge deluge-gtk cairo python-cairo `# GUI Torrent Client` \ - lightdm lightdm-gtk-greeter `# Nice User Login` \ - polybar-git `# Bar` \ + elixir nodejs erlang \ php `# PHP Language` \ nginx `# Web Server` \ postgresql pgcli `# RDBMS` \ - urxvt-perls-git urxvt-resize-font-git `# rxvt-unicode scripts` \ neofetch `# swag` \ cloc `# For counting lines of code` \ - ttf-noto-fonts-simple ttf-noto-fonts-ib noto-fonts-emoji `# Emoji` \ - siji-git gohufont artwiz-fonts `# Bitmap Fonts` \ - autorandr `# Monitor Helper` \ + noto-fonts noto-fonts-emoji `# Emoji` \ docker `# Containers` \ - keybase keybase-gui kbfs `# Keybase Applications` \ discord `# Chat` \ steam steamcmd lutris `# Games` \ gnome-shell `# Guh-nome Guh-shell` \ - redshift `# Save Your Eyes` \ vlc `# Video Viewer` \ ncdu `# Disk Usage Analyzer` \ zathura zathura-pdf-mupdf `# Document Viewer` \ - scrot `# Screenshot Tool` \ libinput libinput-gestures `# Trackpad Control` \ - xcape `# Escape Better` \ - dunst `# Desktop Notifications` \ - gammastep `# Redshift for Wayland` \ - rofimoji `# Emoji Picker` \ - --noconfirm --noedit + efibootmgr efivar `# UEFI Boot CLI Stuff` \ + glu mesa wxgtk2 libpng `# Various` \ + gammastep `# Redshift for Wayland` curl -L -o "$HOME/.emoji.txt" https://lyte.dev/uploads/emoji.txt - -# TODO: recommend systemd services? diff --git a/bin/lib/arch-linux/provisioning/4-comms.bash b/bin/lib/arch-linux/provisioning/4-comms.bash index 1f920ab..2750941 100755 --- a/bin/lib/arch-linux/provisioning/4-comms.bash +++ b/bin/lib/arch-linux/provisioning/4-comms.bash @@ -1,7 +1,6 @@ #!/usr/bin/env bash -pacaur --needed -S --noconfirm --noedit \ - weechat-poljar-matrix-git weechat-discord-git wee-slack +yay -S weechat-poljar-matrix-git weechat-discord-git wee-slack wcpm="/usr/lib/weechat/python/matrix" hwcp="${HOME}/.weechat/python" diff --git a/bin/lib/arch-linux/provisioning/amd.bash b/bin/lib/arch-linux/provisioning/amd.bash index c3ed389..eda2785 100755 --- a/bin/lib/arch-linux/provisioning/amd.bash +++ b/bin/lib/arch-linux/provisioning/amd.bash @@ -1,4 +1,6 @@ #!/usr/bin/env bash -pacaur --needed -S --noconfirm --noedit \ - libva-mesa-driver mesa-vdpau libva-vdpau-driver libvdpau-va-gl `# Hardware Accelerated Video` \ +# TODO: vulkan +yay -S \ + xf86-video-amdgpu mesa \ + libva-mesa-driver mesa-vdpau libva-vdpau-driver libvdpau-va-gl `# Hardware Accelerated Video` diff --git a/bin/lib/arch-linux/provisioning/irc.bash b/bin/lib/arch-linux/provisioning/irc.bash deleted file mode 100755 index 6370652..0000000 --- a/bin/lib/arch-linux/provisioning/irc.bash +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# TODO: setup weechat matrix plugin? -# git clone diff --git a/bin/lib/arch-linux/provisioning/nvidia.bash b/bin/lib/arch-linux/provisioning/nvidia.bash deleted file mode 100755 index 5d72869..0000000 --- a/bin/lib/arch-linux/provisioning/nvidia.bash +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# lib32-nvidia-beta? - -pacaur -S \ - nvidia-beta \ - lib32-nvidia-utils-beta lib32-nvidia-libgl-beta \ - --noconfirm --noedit diff --git a/bin/lib/arch-linux/provisioning/tmux-plugins.bash b/bin/lib/arch-linux/provisioning/tmux-plugins.bash index 31ae239..95a3041 100755 --- a/bin/lib/arch-linux/provisioning/tmux-plugins.bash +++ b/bin/lib/arch-linux/provisioning/tmux-plugins.bash @@ -2,19 +2,15 @@ mkdir -p "$HOME/.config/systemd/user" -# tmux plugin manager [ ! -d "$XDG_CONFIG_HOME/tmux/plugins/tpm" ] && \ git clone https://github.com/tmux-plugins/tpm "$XDG_CONFIG_HOME/tmux/plugins/tpm" -# load tmux config tmux source-file "$HOME/.tmux.conf" -# clean, install, and update plugins bash "$XDG_CONFIG_HOME/tmux/plugins/tpm/bindings/clean_plugins" bash "$XDG_CONFIG_HOME/tmux/plugins/tpm/bindings/install_plugins" bash "$XDG_CONFIG_HOME/tmux/plugins/tpm/bindings/update_plugins" -# load tmux config tmux source-file "$HOME/.tmux.conf" systemctl --user enable tmux.service diff --git a/bin/lib/sudo_setup b/bin/lib/sudo_setup index 741440a..a805eb4 100755 --- a/bin/lib/sudo_setup +++ b/bin/lib/sudo_setup @@ -15,16 +15,19 @@ links=( "apps/de/sway/dm-entry" "/usr/share/wayland-sessions/sway-lytedev.desktop" # TODO: laptop-specific setup? part of laptop env? - # touchpad "apps/de/libinput/touchpad.conf" "/etc/X11/xorg.conf.d/41-libinput-lytedev-touchpad-options.conf" # udev rules "apps/udev-rules/lowbat" "/etc/udev/rules.d/99-lowbat.rules" "apps/udev-rules/wifi-powersave" "/etc/udev/rules.d/81-wifi-powersave.rules" + "apps/udev-rules/gcadapter" "/etc/udev/rules.d/51-gcadapter.rules" # tmpfiles "apps/tmpfiles/disable-lid-wakeup" "/etc/tmpfiles.d/disable-lid-wakeup.conf" + + # lightdm + "apps/de/gnome/gdm-tap-to-click" "/etc/dconf/db/gdm.d/06-tap-to-click" ) _dotfiles_setup_run_setup "$dfp/.agreed-to-erasing-root-files.lock" "${links[@]}" diff --git a/bofa.json b/bofa.json deleted file mode 100644 index e4d4630..0000000 --- a/bofa.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "date": "d/m/Y", - "default_account": 1, - "delimiter": "comma", - "headers": true, - "ignore_duplicate_lines": true, - "ignore_duplicate_transactions": true, - "rules": true, - "skip_form": false, - "specifics": [ - "AppendHash" - ], - "roles": [ - "date_transaction", - "description", - "amount", - ], - "do_mapping": [true, true ,true], - "mapping": { - "3": { - "Savings Account": 3 - }, - "4": { - "Savings Account": 3 - } - }, - "version": 2 -} diff --git a/env/desktop/bin/minecraft b/env/desktop/bin/minecraft new file mode 100755 index 0000000..0578872 --- /dev/null +++ b/env/desktop/bin/minecraft @@ -0,0 +1,3 @@ +#!/bin/sh +export JAVA_HOME="/usr/lib/jvm/java-8-openjdk/jre/" +exec /opt/minecraft-launcher/minecraft-launcher "$@" diff --git a/env/desktop/sway/config.d/main b/env/desktop/sway/config.d/main index e771715..b18c3b7 100644 --- a/env/desktop/sway/config.d/main +++ b/env/desktop/sway/config.d/main @@ -1,4 +1,8 @@ -exec swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 000000' +exec swayidle -w \ + timeout 300 'swaylock -f -c 000000' \ + timeout 600 'swaymsg "output * dpms off"' \ + resume 'swaymsg "output * dpms on"' \ + before-sleep 'swaylock -f -c 000000' # shared # workspace 1 output DP-1