diff --git a/templates/alacritty.yml b/templates/alacritty.yml index 17544fb..0e5786a 100644 --- a/templates/alacritty.yml +++ b/templates/alacritty.yml @@ -118,11 +118,11 @@ font: # - (macOS) Menlo # - (Linux/BSD) monospace # - (Windows) Consolas -{% if platform == "macos" %} +{%- if platform == "macos" %} family: Menlo -{% else %} +{%- else %} family: Source Code Pro -{% endif %} +{%- endif %} # The `style` can be specified to pick a specific face. style: Regular @@ -161,9 +161,9 @@ font: style: Bold Italic # Point size -{% if device == "macbook" %} +{%- if device == "macbook" %} size: 14.0 -{% endif %} +{%- endif %} # Offset is the extra space around each character. `offset.y` can be thought # of as modifying the line spacing, and `offset.x` as modifying the letter diff --git a/templates/i3/i3 b/templates/i3/i3 index 9d577fd..3a8e6de 100644 --- a/templates/i3/i3 +++ b/templates/i3/i3 @@ -14,15 +14,15 @@ set $menu "rofi -show drun" set $term alacritty set $compositor "picom --daemon --inactive-opacity 1 --menu-opacity 1" -{% if device == "desktop" %} +{%- if device == "desktop" %} set $drawingTabletStylus "HUION Huion Tablet Pen stylus" set $drawingTabletPad "HUION Huion Tablet Pad pad" -{% endif %} +{%- endif %} -{% if device == "laptop" %} +{%- if device == "laptop" %} # Import the GTK theming from Gnome exec_always --no-startup-id /usr/lib/gnome-settings-daemon/gsd-xsettings -{% endif %} +{%- endif %} set $alt Mod1 set $mod Mod4 @@ -49,7 +49,7 @@ bindsym $alt+Shift+F12 exec --no-startup-id "pidof picom && pkill picom || picom # Wallpaper exec --no-startup-id nitrogen --restore -{% if device == "desktop" %} +{%- if device == "desktop" %} # Drawing tablet exec --no-startup-id xsetwacom -v --set $drawingTabletStylus MapToOutput HEAD-0 exec --no-startup-id xsetwacom -v --set $drawingTabletPad Button 1 key "b" @@ -64,27 +64,27 @@ exec --no-startup-id xsetwacom -v --set $drawingTabletPad Button 13 key "none" exec --no-startup-id xsetwacom -v --set $drawingTabletPad Button 14 key "none" exec --no-startup-id xsetwacom -v --set $drawingTabletPad Button 15 key "control z" exec --no-startup-id xsetwacom -v --set $drawingTabletPad Button 16 key "control shift z" -{% endif %} +{%- endif %} -{% if device == "desktop" %} +{%- if device == "desktop" %} # Set middle mouse emulation on my mouse exec --no-startup-id xinput set-prop "USB OPTICAL MOUSE " "libinput Middle Emulation Enabled" 1 -{% endif %} +{%- endif %} -{% if device == "laptop" %} +{%- if device == "laptop" %} # Noisetorch exec --no-startup-id noisetorch -i -s alsa_input.pci-0000_00_1f.3.analog-stereo -{% endif %} +{%- endif %} # 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 --color=000000 -{% if device == "laptop" %} +{%- if device == "laptop" %} # 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 -{% endif %} +{%- endif %} # Use pactl to adjust volume in PulseAudio. set $refresh_i3status killall -SIGUSR1 i3status @@ -93,11 +93,11 @@ bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT 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 -{% if device == "laptop" %} +{%- if device == "laptop" %} # Screen brightness controls bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 20 # increase screen brightness bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 20 # decrease screen brightness -{% endif %} +{%- endif %} # Media player controls bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause @@ -236,7 +236,7 @@ mode "resize" { bindsym $mod+r mode "resize" -{% if device == "laptop" %} +{%- if device == "laptop" %} mode "monitor" { # These bindings trigger as soon as you enter the monitor mode # exec "i3-nagbar -p -m 'External displays:' -B 'Mirror' 'echo m' -B 'Extend' 'echo e' -B 'Reset' 'echo r'" @@ -255,7 +255,7 @@ mode "monitor" { } bindsym $mod+p mode "monitor" -{% endif %} +{%- endif %} # class border bground text indicator child_border client.focused {{nord3}} {{nord10}} {{nord4}} {{nord1}} {{nord3}} diff --git a/templates/i3/i3status b/templates/i3/i3status index 0b16ad5..d53c424 100644 --- a/templates/i3/i3status +++ b/templates/i3/i3status @@ -16,13 +16,13 @@ general { } # order += "ipv6" -{% if device == "laptop" %} +{%- if device == "laptop" %} order += "wireless _first_" -{% endif %} +{%- endif %} order += "ethernet _first_" -{% if device == "laptop" %} +{%- if device == "laptop" %} order += "battery all" -{% endif %} +{%- endif %} order += "disk /" order += "load" order += "memory" diff --git a/templates/zshrc b/templates/zshrc index 8f903c0..dfc0cd7 100644 --- a/templates/zshrc +++ b/templates/zshrc @@ -3,11 +3,11 @@ # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -{% if platform == "macos" %} +{%- if platform == "macos" %} export ZSH="$HOME/.oh-my-zsh" -{% else %} +{%- else %} ZSH=/usr/share/oh-my-zsh/ -{% endif %} +{%- endif %} # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, @@ -64,7 +64,7 @@ function precmd() { # Case-sensitive completion must be off. _ and - will be interchangeable. # HYPHEN_INSENSITIVE="true" -{% if platform == "macos" %} +{%- if platform == "macos" %} # Uncomment one of the following lines to change the auto-update behavior # zstyle ':omz:update' mode disabled # disable automatic updates # zstyle ':omz:update' mode auto # update automatically without asking @@ -72,7 +72,7 @@ zstyle ':omz:update' mode reminder # just remind me to update when it's time # Uncomment the following line to change how often to auto-update (in days). # zstyle ':omz:update' frequency 13 -{% else %} +{%- else %} # Uncomment the following line to disable bi-weekly auto-update checks. DISABLE_AUTO_UPDATE="true" @@ -81,7 +81,7 @@ DISABLE_AUTO_UPDATE="true" # Uncomment the following line to change how often to auto-update (in days). # export UPDATE_ZSH_DAYS=13 -{% endif %} +{%- endif %} # Uncomment the following line if pasting URLs and other text is messed up. # DISABLE_MAGIC_FUNCTIONS="true" @@ -194,35 +194,35 @@ function fuck { sudo ${history[@][1]} } -{% if platform == "linux" %} +{%- if platform == "linux" %} export SUDO_ASKPASS=~/bin/askpass-rofi -{% endif %} +{%- endif %} export EDITOR="nvim" -{% if platform == "macos" %} +{%- if platform == "macos" %} export PATH="/usr/local/bin:$PATH" -{% endif %} +{%- endif %} export PATH="$PATH:/home/daniel/.yarn/bin" -{% if device == "laptop" or device == "desktop" %} +{%- if device == "laptop" or device == "desktop" %} export KUBECONFIG=~/.kube/k3s-mcintyre.yaml -{% endif %} +{%- endif %} -{% if platform == "linux" %} +{%- if platform == "linux" %} export LC_ALL="en_US.UTF-8" -{% endif %} +{%- endif %} autoload -U +X bashcompinit && bashcompinit -{% if platform == "linux" %} +{%- if platform == "linux" %} complete -o nospace -C /usr/bin/terraform terraform -{% elif platform == "macos" %} +{%- elif platform == "macos" %} complete -o nospace -C /usr/local/bin/terraform terraform -{% endif %} +{%- endif %} -{% if device == "macbook" %} +{%- if device == "macbook" %} # The next line updates PATH for the Google Cloud SDK. if [ -f '/Users/daniel.de.cloet/google-cloud-sdk/path.zsh.inc' ]; then . '/Users/daniel.de.cloet/google-cloud-sdk/path.zsh.inc'; fi # The next line enables shell command completion for gcloud. if [ -f '/Users/daniel.de.cloet/google-cloud-sdk/completion.zsh.inc' ]; then . '/Users/daniel.de.cloet/google-cloud-sdk/completion.zsh.inc'; fi -{% endif %} +{%- endif %} fortune -s