From: Ruben Beltran del Rio Date: Tue, 18 Jul 2023 19:25:36 +0000 (+0200) Subject: Merge branch 'main' of git.sr.ht:~rbdr/dotfiles X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/d2de72a404ea05860ed2f1c0687890f8b1ee4f22?hp=ce3499096aaf5e54830b99f64ecf159e9809c644 Merge branch 'main' of git.sr.ht:~rbdr/dotfiles --- diff --git a/Xdefaults b/Xdefaults deleted file mode 100644 index 79a02b8..0000000 --- a/Xdefaults +++ /dev/null @@ -1,72 +0,0 @@ -! --------------------------- -! URxvt -! --------------------------- -Xft.dpi: 140 -Xft.antialias: false -Xft.rgba: rgb -Xft.hinting: true -Xft.hintstyle: hintslight - -! --------------------------- -! URxvt -! --------------------------- - -URxvt.depth: 32 -URxvt.geometry: 90x30 -URxvt.fading: 30 - -URxvt.loginShell: true -URxvt.saveLines: 50 -URxvt.internalBorder: 3 -URxvt.lineSpace: 0 -URxvt.transparent: false - -! fonts -URxvt.allow_bold: false -*.font: xft:Input Mono:style=Light:size=11 -*.boldFont: xft:Input Mono:style=Medium:size=11 -*.italicFont: xft:Input Mono:style=Light Italic:size=11 -*.boldItalicFont: xft:Input Mono:style=Medium Italic:size=11 - -! scrollbar -URxvt.scrollbarStyle: rxvt -URxvt.scrollBar: false - -! cursor -URxvt.cursorBlink: true -URxvt.cursorColor: #c8c7c7 - -! pointer -URxvt.pointerBlank: true - -! rbdr theme -! fg / bg -URxvt.background: #3e3937 -URxvt.foreground: #eeeeee -! black -URxvt.color0: #888888 -URxvt.color8: #aaaaaa -! red -URxvt.color1: #ff004d -URxvt.color9: #ff5555 -! green -URxvt.color2: #55ff55 -URxvt.color10: #83ff83 -! yellow -URxvt.color3: #ffec27 -URxvt.color11: #ffff55 -! blue -URxvt.color4: #5555ff -URxvt.color12: #6f6fff -! magenta -URxvt.color5: #ff55ff -URxvt.color13: #ff82ff -! cyan -URxvt.color6: #55ffff -URxvt.color14: #77ffff -! white -URxvt.color7: #c7c7c7 -URxvt.color15: #feffff - -URxvt.keysym.Shift-Control-V: eval:paste_clipboard -URxvt.keysym.Shift-Control-C: eval:selection_to_clipboard diff --git a/config/i3/config b/config/i3/config deleted file mode 100644 index 8021e6d..0000000 --- a/config/i3/config +++ /dev/null @@ -1,186 +0,0 @@ -# This file has been auto-generated by i3-config-wizard(1). -# It will not be overwritten, so edit it as you like. -# -# Should you change your keyboard layout some time, delete -# this file and re-run i3-config-wizard(1). -# - -# i3 config file (v4) -# -# Please see https://i3wm.org/docs/userguide.html for a complete reference! - -set $mod Mod4 - -# Font for window titles. Will also be used by the bar unless a different font -# is used in the bar {} block below. -font pango:Input Mono Light 11 - -# This font is widely installed, provides lots of unicode glyphs, right-to-left -# text rendering and scalability on retina/hidpi displays (thanks to pango). -#font pango:DejaVu Sans Mono 8 - -# Start XDG autostart .desktop files using dex. See also -# https://wiki.archlinux.org/index.php/XDG_Autostart -exec --no-startup-id dex --autostart --environment i3 - -# The combination of xss-lock, nm-applet and pactl is a popular choice, so -# they are included here as an example. Modify as you see fit. - -# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the -# screen before suspend. Use loginctl lock-session to lock your screen. -exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork - -# NetworkManager is the most popular way to manage wireless networks on Linux, -# and nm-applet is a desktop environment-independent system tray GUI for it. -exec --no-startup-id nm-applet - -# Use pactl to adjust volume in PulseAudio. -set $refresh_i3status killall -SIGUSR1 i3status -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status -bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -# start a terminal -bindsym $mod+Return exec i3-sensible-terminal - -# kill focused window -bindsym $mod+Shift+q kill - -# start dmenu (a program launcher) -bindsym $mod+d exec --no-startup-id dmenu_run -# A more modern dmenu replacement is rofi: -# bindcode $mod+40 exec "rofi -modi drun,run -show drun" -# There also is i3-dmenu-desktop which only displays applications shipping a -# .desktop file. It is a wrapper around dmenu, so you need that installed. -# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop - -# change focus -bindsym $mod+h focus left -bindsym $mod+j focus down -bindsym $mod+k focus up -bindsym $mod+l focus right - -# alternatively, you can use the cursor keys: -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# move focused window -bindsym $mod+Shift+h move left -bindsym $mod+Shift+j move down -bindsym $mod+Shift+k move up -bindsym $mod+Shift+l move right - -# alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# split in horizontal orientation -bindsym $mod+b split h - -# split in vertical orientation -bindsym $mod+v split v - -# enter fullscreen mode for the focused container -bindsym $mod+f fullscreen toggle - -# change container layout (stacked, tabbed, toggle split) -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split - -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle - -# focus the parent container -bindsym $mod+a focus parent - -# focus the child container -#bindsym $mod+d focus child - -# Define names for default workspaces for which we configure key bindings later on. -# We use variables to avoid repeating the names in multiple places. -set $ws1 "1" -set $ws2 "2" -set $ws3 "3" -set $ws4 "4" -set $ws5 "5" -set $ws6 "6" -set $ws7 "7" -set $ws8 "8" -set $ws9 "9" -set $ws10 "10" - -# switch to workspace -bindsym $mod+1 workspace number $ws1 -bindsym $mod+2 workspace number $ws2 -bindsym $mod+3 workspace number $ws3 -bindsym $mod+4 workspace number $ws4 -bindsym $mod+5 workspace number $ws5 -bindsym $mod+6 workspace number $ws6 -bindsym $mod+7 workspace number $ws7 -bindsym $mod+8 workspace number $ws8 -bindsym $mod+9 workspace number $ws9 -bindsym $mod+0 workspace number $ws10 - -# move focused container to workspace -bindsym $mod+Shift+1 move container to workspace number $ws1 -bindsym $mod+Shift+2 move container to workspace number $ws2 -bindsym $mod+Shift+3 move container to workspace number $ws3 -bindsym $mod+Shift+4 move container to workspace number $ws4 -bindsym $mod+Shift+5 move container to workspace number $ws5 -bindsym $mod+Shift+6 move container to workspace number $ws6 -bindsym $mod+Shift+7 move container to workspace number $ws7 -bindsym $mod+Shift+8 move container to workspace number $ws8 -bindsym $mod+Shift+9 move container to workspace number $ws9 -bindsym $mod+Shift+0 move container to workspace number $ws10 - -# reload the configuration file -bindsym $mod+Shift+c reload -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+r restart -# exit i3 (logs you out of your X session) -bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" - -# resize window (you can also use the mouse for that) -mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym l resize shrink height 10 px or 10 ppt - bindsym semicolon resize grow width 10 px or 10 ppt - - # same bindings, but for the arrow keys - 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 - - # back to normal: Enter or Escape or $mod+r - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" -} - -bindsym $mod+r mode "resize" - -# Start i3bar to display a workspace bar (plus the system information i3status -# finds out, if available) -bar { - status_command i3status -} diff --git a/config/qutebrowser/autoconfig.yml b/config/qutebrowser/autoconfig.yml new file mode 100644 index 0000000..512b017 --- /dev/null +++ b/config/qutebrowser/autoconfig.yml @@ -0,0 +1,100 @@ +# If a config.py file exists, this file is ignored unless it's explicitly loaded +# via config.load_autoconfig(). For more information, see: +# https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/configuring.asciidoc#loading-autoconfigyml +# DO NOT edit this file by hand, qutebrowser will overwrite it. +# Instead, create a config.py - see :help for details. + +config_version: 2 +settings: + backend: + global: webengine + colors.completion.category.bg: + global: black + colors.completion.category.border.bottom: + global: '#00FFFF' + colors.completion.category.border.top: + global: '#00FFFF' + colors.completion.even.bg: + global: '#000000' + colors.completion.fg: + global: + - white + - white + - white + colors.completion.item.selected.bg: + global: '#00FF00' + colors.completion.item.selected.border.bottom: + global: '#00FF00' + colors.completion.item.selected.border.top: + global: '#00FF00' + colors.completion.item.selected.match.fg: + global: '#FF00FF' + colors.completion.match.fg: + global: '#FF00FF' + colors.completion.odd.bg: + global: '#222222' + colors.completion.scrollbar.bg: + global: '#0000FF' + colors.completion.scrollbar.fg: + global: '#FFFFFF' + colors.prompts.bg: + global: '#444444' + colors.statusbar.caret.selection.bg: + global: '#0000FF' + colors.statusbar.caret.selection.fg: + global: white + colors.statusbar.command.private.fg: + global: white + colors.statusbar.insert.bg: + global: '#00FF00' + colors.statusbar.insert.fg: + global: '#000000' + colors.statusbar.passthrough.fg: + global: white + colors.statusbar.private.bg: + global: '#666666' + colors.statusbar.url.error.fg: + global: orange + colors.statusbar.url.fg: + global: white + colors.tabs.bar.bg: + global: '#000000' + colors.tabs.even.bg: + global: '#000000' + colors.tabs.even.fg: + global: white + colors.tabs.indicator.start: + global: '#0000FF' + colors.tabs.indicator.stop: + global: '#00FF00' + colors.tabs.odd.bg: + global: '#000000' + colors.tabs.odd.fg: + global: white + colors.tabs.pinned.even.bg: + global: '#FF00FF' + colors.tabs.pinned.odd.bg: + global: '#FF00FF' + colors.tabs.pinned.selected.even.bg: + global: '#00FFFF' + colors.tabs.pinned.selected.even.fg: + global: black + colors.tabs.pinned.selected.odd.bg: + global: '#00FFFF' + colors.tabs.pinned.selected.odd.fg: + global: black + colors.tabs.selected.even.bg: + global: '#00FFFF' + colors.tabs.selected.even.fg: + global: black + colors.tabs.selected.odd.bg: + global: '#00FFFF' + colors.tabs.selected.odd.fg: + global: black + url.default_page: + global: https://unlimited.pizza + url.searchengines: + global: + DEFAULT: https://kagi.com/search?q={} + url.start_pages: + global: https://unlimited.pizza diff --git a/config/qutebrowser/bookmarks/urls b/config/qutebrowser/bookmarks/urls new file mode 100644 index 0000000..e69de29 diff --git a/config/qutebrowser/quickmarks b/config/qutebrowser/quickmarks new file mode 100644 index 0000000..e69de29 diff --git a/config/sway/config b/config/sway/config new file mode 100644 index 0000000..c408540 --- /dev/null +++ b/config/sway/config @@ -0,0 +1,237 @@ +# Default config for sway +# +# Copy this to ~/.config/sway/config and edit it to your liking. +# +# Read `man 5 sway` for a complete reference. + +### Variables +# +# Logo key. Use Mod1 for Alt. +set $mod Mod4 +# Home row direction keys, like vim +set $left h +set $down j +set $up k +set $right l +# Your preferred terminal emulator +set $term kitty + +# Theme Variables +set $font "Input Mono Light 12" +set $highlight #00FFFF +set $prompt #00FF00 + +# Font +font pango:Input Mono Light 12 + +# class / border / bg / fg / indicator / child_border +client.focused #00FFFF #000000 #FFFFFF #00FF00 #00FFFF +client.focused_inactive #00FFFF #000000 #666666 #00FF00 #00FFFF +client.unfocused #666666 #000000 #888888 #666666 #666666 +client.urgent #FF00FF #000000 #FFFFFF #00FF00 #FF00FF + +# Your preferred application launcher +# Note: pass the final command to swaymsg so that the resulting window can be opened +# on the original workspace that the command was run on. +set $menu bemenu-run --fn $font -b -p "$" --tf "$prompt" --hf "$highlight" --sf "$highlight" --scf "$highlight" | xargs swaymsg exec + +### Output configuration +# +# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) +output * bg ~/Pictures/lisa-congdon/BrightSpots_800x800.webp tile #000000 +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs + +### Idle configuration +# +# Example configuration: +# +# exec swayidle -w \ +# timeout 300 'swaylock -f -c 000000' \ +# timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ +# before-sleep 'swaylock -f -c 000000' +# +# This will lock your screen after 300 seconds of inactivity, then turn off +# your displays after another 300 seconds, and turn your screens back on when +# resumed. It will also lock your screen before your computer goes to sleep. + +### Input configuration +# +# Example configuration: +# +# input "2:14:SynPS/2_Synaptics_TouchPad" { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# You can get the names of your inputs by running: swaymsg -t get_inputs +# Read `man 5 sway-input` for more information about this section. + +input * { + xkb_options ctrl:nocaps +} + +### Key bindings +# +# Basics: +# + # Start a terminal + bindsym $mod+Return exec $term + + # Kill focused window + bindsym $mod+Shift+q kill + + # Start your launcher + bindsym $mod+d exec $menu + + # Drag floating windows by holding down $mod and left mouse button. + # Resize them with right mouse button + $mod. + # Despite the name, also works for non-floating windows. + # Change normal to inverse to use left mouse button for resizing and right + # mouse button for dragging. + floating_modifier $mod normal + + # Reload the configuration file + bindsym $mod+Shift+c reload + + # 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' +# +# Moving around: +# + # Move your focus around + bindsym $mod+$left focus left + bindsym $mod+$down focus down + bindsym $mod+$up focus up + bindsym $mod+$right focus right + # Or use $mod+[up|down|left|right] + bindsym $mod+Left focus left + bindsym $mod+Down focus down + bindsym $mod+Up focus up + bindsym $mod+Right focus right + + # Move the focused window with the same, but add Shift + bindsym $mod+Shift+$left move left + bindsym $mod+Shift+$down move down + bindsym $mod+Shift+$up move up + bindsym $mod+Shift+$right move right + # Ditto, with arrow keys + bindsym $mod+Shift+Left move left + bindsym $mod+Shift+Down move down + bindsym $mod+Shift+Up move up + bindsym $mod+Shift+Right move right +# +# Workspaces: +# + # Switch to workspace + bindsym $mod+1 workspace number 1 + bindsym $mod+2 workspace number 2 + bindsym $mod+3 workspace number 3 + bindsym $mod+4 workspace number 4 + bindsym $mod+5 workspace number 5 + bindsym $mod+6 workspace number 6 + bindsym $mod+7 workspace number 7 + bindsym $mod+8 workspace number 8 + bindsym $mod+9 workspace number 9 + bindsym $mod+0 workspace number 10 + # Move focused container to workspace + bindsym $mod+Shift+1 move container to workspace number 1 + bindsym $mod+Shift+2 move container to workspace number 2 + bindsym $mod+Shift+3 move container to workspace number 3 + bindsym $mod+Shift+4 move container to workspace number 4 + bindsym $mod+Shift+5 move container to workspace number 5 + bindsym $mod+Shift+6 move container to workspace number 6 + bindsym $mod+Shift+7 move container to workspace number 7 + bindsym $mod+Shift+8 move container to workspace number 8 + bindsym $mod+Shift+9 move container to workspace number 9 + bindsym $mod+Shift+0 move container to workspace number 10 + # Note: workspaces can have any name you want, not just numbers. + # We just use 1-10 as the default. +# +# Layout stuff: +# + # You can "split" the current object of your focus with + # $mod+b or $mod+v, for horizontal and vertical splits + # respectively. + bindsym $mod+b splith + bindsym $mod+v splitv + + # Switch the current container between different layout styles + bindsym $mod+s layout stacking + bindsym $mod+w layout tabbed + bindsym $mod+e layout toggle split + + # Make the current focus fullscreen + bindsym $mod+f fullscreen + + # Toggle the current focus between tiling and floating mode + bindsym $mod+Shift+space floating toggle + + # Swap focus between the tiling area and the floating area + bindsym $mod+space focus mode_toggle + + # Move focus to the parent container + bindsym $mod+a focus parent +# +# Scratchpad: +# + # Sway has a "scratchpad", which is a bag of holding for windows. + # You can send windows there and get them back later. + + # Move the currently focused window to the scratchpad + bindsym $mod+Shift+minus move scratchpad + + # Show the next scratchpad window or hide the focused scratchpad window. + # If there are multiple scratchpad windows, this command cycles through them. + bindsym $mod+minus scratchpad show +# +# Resizing containers: +# +mode "resize" { + # left will shrink the containers width + # right will grow the containers width + # up will shrink the containers height + # down will grow the containers height + bindsym $left resize shrink width 10px + bindsym $down resize grow height 10px + bindsym $up resize shrink height 10px + bindsym $right resize grow width 10px + + # Ditto, with arrow keys + bindsym Left resize shrink width 10px + bindsym Down resize grow height 10px + bindsym Up resize shrink height 10px + bindsym Right resize grow width 10px + + # Return to default mode + bindsym Return mode "default" + bindsym Escape mode "default" +} +bindsym $mod+r mode "resize" + +# +# Status Bar: +# +# Read `man 5 sway-bar` for more information about this section. +bar { + position top + + # When the status_command prints a new line to stdout, swaybar updates. + # The default just shows the current date and time. + status_command while ~/.config/sway/status.sh; do sleep 1; done + + colors { + statusline #ffffff + background #000000 + # class / border / bg / fg + focused_workspace #00FFFF #00FFFF #000000 + inactive_workspace #666666 #000000 #666666 + active_workspace #00FF00 #000000 #00FF00 + urgent_workspace #FF00FF #FF00FF #000000 + } +} + +include /etc/sway/config.d/* diff --git a/config/sway/status.sh b/config/sway/status.sh new file mode 100755 index 0000000..7cd6e5d --- /dev/null +++ b/config/sway/status.sh @@ -0,0 +1,9 @@ +bat_capacity=$(cat /sys/class/power_supply/macsmc-battery/capacity) +bat_status=$(cat /sys/class/power_supply/macsmc-battery/status) +datestr=$(date +'%Y-%m-%d %H:%M:%S') +drive=$(df -h / --output=avail | tail -n 1 | awk '{$1=$1};1') +wifi_status=$(nmcli -t -f IN-USE,BARS,SSID dev wifi | rg '^\*') +wifi_bars=$(echo ${wifi_status} | cut -d':' -f 2) +wifi_ssid=$(echo ${wifi_status} | cut -d':' -f 3) + +echo "${wifi_bars} ${wifi_ssid} | ${drive} | ${bat_capacity}% [${bat_status:0:1}] | ${datestr}" diff --git a/config/sway/sway b/config/sway/sway new file mode 120000 index 0000000..2a77115 --- /dev/null +++ b/config/sway/sway @@ -0,0 +1 @@ +../.dotfiles/config/sway \ No newline at end of file diff --git a/install b/install index 03eea48..957e294 100755 --- a/install +++ b/install @@ -32,9 +32,6 @@ ln -fns .dotfiles/nethackrc ~/.nethackrc # Git ln -fns .dotfiles/gitconfig ~/.gitconfig -# XDefaults -ln -fns .dotfiles/Xdefaults ~/.Xdefaults - # ripgrep ln -fns .dotfiles/rgignore ~/.rgignore @@ -59,8 +56,11 @@ ln -fns ../.dotfiles/config/nvim ~/.config/nvim # karabiner ln -fns ../.dotfiles/config/karabiner ~/.config/karabiner -# i3 -ln -fns ../.dotfiles/config/i3 ~/.config/i3 +# sway +ln -fns ../.dotfiles/config/sway ~/.config/sway + +# sway +ln -fns ../.dotfiles/config/qutebrowser ~/.config/qutebrowser touch ~/.tool-versions diff --git a/provisioning/pacman_essential b/provisioning/pacman_essential index 7825a5e..6c65bce 100644 --- a/provisioning/pacman_essential +++ b/provisioning/pacman_essential @@ -1,8 +1,7 @@ --noconfirm -rxvt-unicode -i3-wm -i3status -dmenu +kitty +sway +bemenu bat curl fd @@ -10,6 +9,7 @@ exa fzf gnupg htop +qutebrowser ripgrep rsync tmux diff --git a/zsh/modules/aliases.zsh b/zsh/modules/aliases.zsh index 623d75d..2037e9e 100644 --- a/zsh/modules/aliases.zsh +++ b/zsh/modules/aliases.zsh @@ -28,7 +28,9 @@ alias gm='git merge' alias gp='git push' # Graphicsmagick override -alias grm="$(brew --prefix)/bin/gm" +if command -v brew &> /dev/null; then + alias grm="$(brew --prefix)/bin/gm" +fi # JS friendly tree alias arbol="tree -I 'node_modules|bower_components|doc|__pycache__|\.pyc'"