From 1d35223a24ce69e72411e11ca210604b6a8c2a45 Mon Sep 17 00:00:00 2001 From: Ruben Beltran del Rio Date: Tue, 28 Feb 2023 19:44:55 +0000 Subject: Update linux config --- XDefaults | 67 -------------------- Xdefaults | 69 +++++++++++++++++++++ config/i3/config | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ install | 7 ++- 4 files changed, 260 insertions(+), 69 deletions(-) delete mode 100644 XDefaults create mode 100644 Xdefaults create mode 100644 config/i3/config diff --git a/XDefaults b/XDefaults deleted file mode 100644 index 8ed297e..0000000 --- a/XDefaults +++ /dev/null @@ -1,67 +0,0 @@ -! --------------------------- -! URxvt -! --------------------------- -Xft.dpi: 96 -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 -URxvt*font: xft:Hasklig-Regular:pixelsize=16 -URxvt*italicFont: xft:Hasklig-It:pixelsize=16 - -! 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 diff --git a/Xdefaults b/Xdefaults new file mode 100644 index 0000000..aa76cd2 --- /dev/null +++ b/Xdefaults @@ -0,0 +1,69 @@ +! --------------------------- +! URxvt +! --------------------------- +Xft.dpi: 96 +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:pixelsize=11 +*.boldFont: xft:Input Mono:style=Medium:pixelsize=11 +*.italicFont: xft:Input Mono:style=Light Italic:pixelsize=11 +*.boldItalicFont: xft:Input Mono:style=Medium Italic:pixelsize=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 diff --git a/config/i3/config b/config/i3/config new file mode 100644 index 0000000..73cbf12 --- /dev/null +++ b/config/i3/config @@ -0,0 +1,186 @@ +# 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 Mod1 + +# 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 8 + +# 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+- 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/install b/install index 64a3131..ba0458b 100755 --- a/install +++ b/install @@ -40,7 +40,7 @@ ln -fns .dotfiles/gitconfig ~/.gitconfig ln -fns .dotfiles/ctags.d ~/.ctags.d # XDefaults -ln -fns .dotfiles/XDefaults ~/.XDefaults +ln -fns .dotfiles/Xdefaults ~/.Xdefaults # ripgrep ln -fns .dotfiles/rgignore ~/.rgignore @@ -57,9 +57,12 @@ ln -fns ../.dotfiles/config/kitty ~/.config/kitty # nvim ln -fns ../.dotfiles/config/nvim ~/.config/nvim -# config +# Karabiner ln -fns ../.dotfiles/config/karabiner ~/.config/karabiner +# i3 +ln -fns ../.dotfiles/config/i3 ~/.config/i3 + touch ~/.tool-versions # Italics setup -- cgit From 8503727ab086d3e81f90abb7734b18c584ac08fd Mon Sep 17 00:00:00 2001 From: Ruben Beltran del Rio Date: Tue, 28 Feb 2023 20:06:24 +0000 Subject: Update URxvt copy and paste --- Xdefaults | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Xdefaults b/Xdefaults index aa76cd2..3a71a21 100644 --- a/Xdefaults +++ b/Xdefaults @@ -67,3 +67,6 @@ 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 -- cgit From ad7a214d01c42b9c784e5d2b79466ec25f56bd22 Mon Sep 17 00:00:00 2001 From: Ruben Beltran del Rio Date: Sat, 4 Mar 2023 01:17:58 +0100 Subject: Add arch support, update X settings --- Xdefaults | 10 +++++----- config/i3/config | 2 +- provision | 13 ++++++++++--- provisioning/pacman_essential | 21 +++++++++++++++++++++ runcoms/zshrc | 12 ++++++++++-- 5 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 provisioning/pacman_essential diff --git a/Xdefaults b/Xdefaults index 3a71a21..79a02b8 100644 --- a/Xdefaults +++ b/Xdefaults @@ -1,7 +1,7 @@ ! --------------------------- ! URxvt ! --------------------------- -Xft.dpi: 96 +Xft.dpi: 140 Xft.antialias: false Xft.rgba: rgb Xft.hinting: true @@ -23,10 +23,10 @@ URxvt.transparent: false ! fonts URxvt.allow_bold: false -*.font: xft:Input Mono:style=Light:pixelsize=11 -*.boldFont: xft:Input Mono:style=Medium:pixelsize=11 -*.italicFont: xft:Input Mono:style=Light Italic:pixelsize=11 -*.boldItalicFont: xft:Input Mono:style=Medium Italic:pixelsize=11 +*.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 diff --git a/config/i3/config b/config/i3/config index 73cbf12..22790fe 100644 --- a/config/i3/config +++ b/config/i3/config @@ -13,7 +13,7 @@ set $mod Mod1 # 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 8 +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). diff --git a/provision b/provision index 60a5201..baac03b 100755 --- a/provision +++ b/provision @@ -5,18 +5,25 @@ if [[ -z "$1" ]]; then else if command -v brew &> /dev/null; then command_name="brew" + install_command="install" else if command -v apt &> /dev/null; then command_name="apt" + install_command="install" else - echo "Error: No valid package manager. Make sure brew or apt are available." - exit 1 + if command -v pacman &> /dev/null; then + command_name="pacman" + install_command="-Sy" + else + echo "Error: No valid package manager. Make sure brew or apt are available." + exit 1 + fi fi fi file="./provisioning/${command_name}_$1" if [[ -f $file ]]; then echo "Provisioning $1 with $command_name" - cat ./provisioning/${command_name}_$1 | xargs ${command_name} install + cat ./provisioning/${command_name}_$1 | xargs ${command_name} ${install_command} else echo "No provisioning recipe for $1 with $command_name" exit 1 diff --git a/provisioning/pacman_essential b/provisioning/pacman_essential new file mode 100644 index 0000000..7825a5e --- /dev/null +++ b/provisioning/pacman_essential @@ -0,0 +1,21 @@ +--noconfirm +rxvt-unicode +i3-wm +i3status +dmenu +bat +curl +fd +exa +fzf +gnupg +htop +ripgrep +rsync +tmux +tree +neovim +wget +zsh +inetutils +z diff --git a/runcoms/zshrc b/runcoms/zshrc index ea7d522..808616a 100644 --- a/runcoms/zshrc +++ b/runcoms/zshrc @@ -88,12 +88,20 @@ fi if [[ -s "/opt/homebrew/bin/brew" ]]; then . /opt/homebrew/etc/profile.d/z.sh else - . /usr/local/etc/profile.d/z.sh + if [[ -s "/usr/share/z/z.sh" ]]; then + . /usr/share/z/z.sh + else + . /usr/local/etc/profile.d/z.sh + fi fi # ASDF if ! command -v brew &> /dev/null; then - . $HOME/.asdf/asdf.sh + if [[ -s "/opt/asdf-vm/asdf.sh" ]]; then + . /opt/asdf-vm/asdf.sh + else + . $HOME/.asdf/asdf.sh + fi else . $(brew --prefix asdf)/asdf.sh fi -- cgit From f6b56240fff7c0ddf862c77434c2dc9fd54fd543 Mon Sep 17 00:00:00 2001 From: Ruben Beltran del Rio Date: Sat, 4 Mar 2023 16:44:37 +0100 Subject: Use super and b --- config/i3/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/i3/config b/config/i3/config index 22790fe..8021e6d 100644 --- a/config/i3/config +++ b/config/i3/config @@ -9,7 +9,7 @@ # # Please see https://i3wm.org/docs/userguide.html for a complete reference! -set $mod Mod1 +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. @@ -83,7 +83,7 @@ bindsym $mod+Shift+Up move up bindsym $mod+Shift+Right move right # split in horizontal orientation -bindsym $mod+- split h +bindsym $mod+b split h # split in vertical orientation bindsym $mod+v split v -- cgit