transitioned to alacritty.toml

.config/alacritty.toml

@@ -0,0 +1,34 @@
+[font]
+size = 9
+
+[font.bold]
+family = "liberation mono"
+style = "Bold"
+
+[font.bold_italic]
+family = "liberation mono"
+style = "Bold Italic"
+
+[font.italic]
+family = "liberation mono"
+style = "Italic"
+
+[font.normal]
+family = "liberation mono"
+style = "Regular"
+
+[font.offset]
+x = 0
+y = 0
+
+[[keyboard.bindings]]
+action = "SpawnNewInstance"
+key = "Return"
+mods = "Super"
+
+[scrolling]
+history = 5000
+
+[window.padding]
+x = 2
+y = 2

.config/alacritty.yml

@@ -1,26 +0,0 @@
-window:
-  padding:
-    x: 2
-    y: 2
-
-scrolling:
-  history: 5000
-
-font:
-  size: 9
-  normal:
-    family: liberation mono
-    style: Regular
-  bold:
-    family: liberation mono
-    style: Bold
-  italic:
-    family: liberation mono
-    style: Italic
-  bold_italic:
-    family: liberation mono
-    style: Bold Italic
-  offset:
-    x: 0
-    y: 0
-

.config/i3status-rust/config.toml

@@ -1,71 +1,49 @@
-# note: pinned on 0.22.0-1 (extra/i3status-rust)
+icons_format = "{icon}"
 
-theme = "bad-wolf"
+[theme]
+theme = "nord-dark"
+#[theme.overrides]
+#idle_bg = "#123456"
+#idle_fg = "#abcdef"
 
 [icons]
-name = "awesome"
+icons = "awesome6"
-[icons.overrides]
+#[icons.overrides]
-seperator = ""
+#bat = ["|E|", "|_|", "|=|", "|F|"]
-#time = ""
+#bat_charging = "|^| "
-#update = ""
-#uptime = ""
 
 [[block]]
-block = "focused_window"
+block = "cpu"
-max_width=80
+info_cpu = 20
-show_marks="visible"
+warning_cpu = 50
+critical_cpu = 90
 
 [[block]]
 block = "disk_space"
 path = "/"
-alias = "/"
+info_type = "available"
-info_type = "used"
+alert_unit = "GB"
-unit = "GB"
 interval = 20
-warning = 900.0
+warning = 20.0
-alert = 940.0
+alert = 10.0
-format="ssd {available} ({percentage})"
+format = " $icon root: $available.eng(w:2) "
-
-[[block]]
-block = "disk_space"
-path = "/hdd"
-alias = "/hdd"
-info_type = "used"
-unit = "GB"
-interval = 20
-warning = 2800.0
-alert = 2950.0
-format="hdd {available} ({percentage})"
 
 [[block]]
 block = "memory"
-display_type = "memory"
+format = " $icon $mem_total_used_percents.eng(w:2) "
-format_mem = "{mem_used_percents}"
+format_alt = " $icon_swap $swap_used_percents.eng(w:2) "
-format_swap = "{swap_used_percents}"
-warning_mem = 75.0
-critical_swap = 80.0
-
-[[block]]
-block = "cpu"
-interval = 1
-warning = 50
 
 [[block]]
 block = "sound"
-
+[[block.click]]
-[[block]]
+button = "left"
-block = "pacman"
+cmd = "pavucontrol"
-interval = 600
-format = "{pacman} updates"
-hide_when_uptodate = true
-on_click = "fakeroot pacman -Qu --dbpath /tmp/checkup-db-andy/ | dmenu -l 25 -f -p 'to be installed'"
-
-[[block]]
-block = "uptime"
 
 [[block]]
 block = "time"
 interval = 5
-format = "%a %b %d : %Y-%m-%d : %l:%M:%S %p"
+format = " $timestamp.datetime(f:'%a %d/%m %R') "
-
 
+[[block]]
+block = "battery"
+format = " $icon $percentage "

.config/nvim/coc-settings.json

@@ -7,7 +7,7 @@
             "command": "rnix-lsp",
             "filetypes": ["nix"]
         },
-        "nix": {
+        "makepkg": {
             "command": "pkgbuild-language-server",
             "filetypes": ["PKGBUILD"]
         },
@@ -46,20 +46,61 @@
     },
     "clangd.semanticHighlighting": true,
     "rust-analyzer.updates.checkOnStartup": false,
+    "rust-analyzer.server.path": "~/bin/ra/rust-analyzer-x86_64-unknown-linux-gnu",
+    "rust-analyzer.hover.memoryLayout.enable": true,
     "cSpell.userWords": [
       "Framebuffer",
       "Minecraft",
       "Odometry",
       "Vulkan",
       "endianness",
+      "lerp",
       "rasterization",
       "repr",
       "setpoint",
+      "spirv",
       "tpope",
       "ultigrep",
       "wgpu"
     ],
     "cSpell.ignoreWords": [
       "deque"
+    ],
+    "cSpell.enabledLanguageIds": [
+      "asciidoc",
+      "c",
+      "cpp",
+      "csharp",
+      "css",
+      "git-commit",
+      "gitcommit",
+      "go",
+      "handlebars",
+      "haskell",
+      "html",
+      "jade",
+      "java",
+      "javascript",
+      "javascriptreact",
+      "json",
+      "jsonc",
+      "latex",
+      "less",
+      "markdown",
+      "md",
+      "php",
+      "plaintext",
+      "pug",
+      "python",
+      "restructuredtext",
+      "rust",
+      "scala",
+      "scss",
+      "text",
+      "typescript",
+      "typescriptreact",
+      "vim",
+      "yaml",
+      "yml"
     ]
 }

.config/nvim/init.vim

@@ -166,6 +166,7 @@ set tabstop=4
 
 set scrolloff=2 " margin on bottom
 set autoread " read files changed in other editors
+set clipboard+=unnamedplus " system clipboard
 
 let first_run = 0
 if has('win32') " Installs Vim-Plug TODO: fix this, it currently works on 0% of platforms

.config/sway/config

@@ -24,7 +24,7 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec --
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
 #output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
-output * bg ~/Documents/media/wallpapers/kestrel1.jpg fill
+#output * bg ~/Documents/media/wallpapers/kestrel1.jpg fill
 #
 # Example configuration:
 #
@@ -60,61 +60,6 @@ output * bg ~/Documents/media/wallpapers/kestrel1.jpg fill
 # Read `man 5 sway-input` for more information about this section.
 
 ### options
-
-output HDMI-A-1 {
-    mode 1920x1080
-    pos 0,1080
-}
-
-output DP-2 {
-    mode 1920x1080
-    pos 1920,600
-    transform 90
-
-    bg /home/andy/Documents/media/wallpapers/su30-1.jpg fill
-}
-
-# mac (over vnc)
-# enable with `swaymsg create_output HEADLESS-1`
-# start vnc with `wayvnc --output=HEADLESS-1 --max-fps=20 0.0.0.0 5900`
-# note: wayvnc is compiled against libplacebo 4.208, freeze that until a wayvnc update (ffmpeg conflict)
-output HEADLESS-3 {
-    #pos 1920,180
-    pos 3000,1920
-    # mac resolution
-    mode 1440x900 
-    #transform 90
-}
-# TODO: find the correct syntax for this
-#exec swaymsg create_output HEADLESS-1
-#exec wayvnc --output=HEADLESS-1 0.0.0.0 5900
-
-# kindle (over vnc)
-# enable with `swaymsg create_output HEADLESS-2`
-# start vnc with `firevnc` (after starting sp3vnc)
-output HEADLESS-2 {
-    pos 1480 2160
-    # native
-    #mode 1024x600
-    mode 751x440
-    transform 90
-    #scale 1.25
-
-    bg /home/andy/Documents/media/wallpapers/su30-2.jpg fill
-}
-#exec swaymsg create_output HEADLESS-2
-#exec wayvnc --output=HEADLESS-2 0.0.0.0 5901
-
-# sp3 (over vnc)
-# start vnc with `sp3vnc`
-output HEADLESS-1 {
-    pos 400,2160
-    # mac resolution
-    mode 2160x1440
-    scale 2
-    #mode 1080x720
-    # 4k is detrimental over vnc + super-retina
-}
 #exec swaymsg create_output HEADLESS-3
 #exec wayvnc --output=HEADLESS-3 0.0.0.0 5902
 
@@ -129,21 +74,22 @@ set $opacity 0.9
 set $deskmenu exec $term -e sway-launcher-desktop
 bindsym $mod+c exec $deskmenu
 bindsym $mod+d exec ulauncher-toggle
-bindsym XF86Search exec ulauncher-toggle
+bindsym XF86Search exec nv
 
 for_window [class=".*"] border pixel 2
 
-for_window [title="Alacritty"] opacity $opacity
+#for_window [title="Alacritty"] opacity $opacity
 #for_window [title="st"] opacity $opacity
 for_window [app_id="Alacritty"] border pixel 1
 for_window [app_id="Alacritty"] gaps inner 5
 for_window [app_id="Alacritty"] gaps outer 3
 
+exec funring
 
 exec ulauncher
 for_window [app_id="ulauncher"] border none, opacity 0.9
 
-for_window [class="firefox"] opacity 1.0
+#for_window [class="firefox"] opacity 1.0
 
 #for_window [title="bgb*"] floating enable
 
@@ -159,12 +105,16 @@ bindsym $mod+n exec makoctl dismiss
 
 # music play/pause
 #bindsym --locked XF86AudioPlay exec pragha -t
-bindsym --locked XF86AudioPlay exec playerctl play-pause
+bindsym --locked XF86AudioPlay exec "playerctl --player=spotify,pragha,%any play-pause"
 
 # volume
 bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +3%
 bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -3%
 
+# brightness
+bindsym XF86MonBrightnessUp exec light -A 5
+bindsym XF86MonBrightnessDown exec light -U 5
+
 # use msft keys for first 5 spaces
 bindsym XF86Launch5 workspace number 1
 bindsym XF86Launch6 workspace number 2
@@ -176,8 +126,9 @@ bindsym XF86Favorites scratchpad show
 
 bindsym Print move container to workspace f 
 
-bindsym $mod++Shift+r exec /home/andy/Documents/applications/wf-recorder/build/wf-recorder -g "$(slurp)" -f /home/andy/Documents/recording.webm
+#bindsym $mod+Shift+r exec wf-recorder -g "$(slurp)" -f /home/andy/Documents/media/screenshots/"$(date +%Y-%m-%d-%H:%M:%S)".webm
-bindsym $mod++Shift+t exec killall -SIGINT /home/andy/Documents/applications/wf-recorder/build/wf-recorder
+bindsym $mod+Shift+t exec killall -SIGINT wf-recorder
+#bindsym $mod+Shift+f exec grim -g "$(slurp)" /home/andy/Documents/media/screenshots/"$(date +%Y-%m-%d-%H:%M:%S)".png
 
 bindsym $mod+Control+Shift+$right move workspace to output right
 bindsym $mod+Control+Shift+$left move workspace to output left
@@ -232,16 +183,16 @@ bindsym $mod+Shift+s exec bash ~/.config/sway/fancelock.sh
 #	--inside-clear-color ff212f70 \
 #	--key-hl-color 1111f160
 # screen locking
-exec_always killall swayidle
+#exec_always killall swayidle
-exec_always swayidle -w \
+#exec_always swayidle -w \
-	timeout 545 'notify-send "sleep:" "blanking in 15s"' \
+#	timeout 545 'notify-send "sleep:" "blanking in 15s"' \
-	timeout 550 'notify-send "sleep:" "blanking in 10s"' \
+#	timeout 550 'notify-send "sleep:" "blanking in 10s"' \
-	timeout 555 'notify-send "sleep:" "blanking in 5s"' \
+#	timeout 555 'notify-send "sleep:" "blanking in 5s"' \
-	timeout 600 'swaylock -f -c 000000 --daemonize -i /home/andy/Documents/media/wallpapers/kestrel5.jpg -l --ring-color 1108ee08 --inside-color 1108ee02 --indicator-x-position 1343 --indicator-y-position 680 --indicator-radius 220 --indicator-thickness 20 --ring-clear-color 1100ff10 --inside-clear-color 1f41ff70 --ring-wrong-color ff000010 --inside-clear-color ff212f70 --key-hl-color 1111f160' \
+#	timeout 600 'swaylock -f -c 000000 --daemonize -i /home/andy/Documents/media/wallpapers/kestrel5.jpg -l --ring-color 1108ee08 --inside-color 1108ee02 --indicator-x-position 1343 --indicator-y-position 680 --indicator-radius 220 --indicator-thickness 20 --ring-clear-color 1100ff10 --inside-clear-color 1f41ff70 --ring-wrong-color ff000010 --inside-clear-color ff212f70 --key-hl-color 1111f160' \
-	timeout 660 'swaymsg "output * dpms off"' \
+#	timeout 660 'swaymsg "output * dpms off"' \
-		resume 'swaymsg "output * dpms on"' \
+#		resume 'swaymsg "output * dpms on"' \
-	before-sleep 'swaylock -f -c 000000 --daemonize -i /home/andy/Documents/media/wallpapers/kestrel5.jpg -l --ring-color 1108ee08 --inside-color 1108ee02 --indicator-x-position 1343 --indicator-y-position 680 --indicator-radius 220 --indicator-thickness 20 --ring-clear-color 1100ff10 --inside-clear-color 1f41ff70 --ring-wrong-color ff000010 --inside-clear-color ff212f70 --key-hl-color 1111f160'
+#	before-sleep 'swaylock -f -c 000000 --daemonize -i /home/andy/Documents/media/wallpapers/kestrel5.jpg -l --ring-color 1108ee08 --inside-color 1108ee02 --indicator-x-position 1343 --indicator-y-position 680 --indicator-radius 220 --indicator-thickness 20 --ring-clear-color 1100ff10 --inside-clear-color 1f41ff70 --ring-wrong-color ff000010 --inside-clear-color ff212f70 --key-hl-color 1111f160'
-
+#
 #exec swayidle -w before-sleep 'swaylock -f -c 000000'
 
 
@@ -399,10 +350,12 @@ bar {
     
     #swaybar_command i3status-rs
 
-    font pango: FontAwesome, Noto Sans Mono 10
+    font pango: FontAwesome 15px, Noto Sans Mono 12px
 
     status_command i3status-rs
 
+    height 15
+
     #status_command i3blocks
 
     #status_command while date +'%a %b %d : %Y-%m-%d : %l:%M:%S %p'; do sleep 1;done
@@ -418,4 +371,8 @@ bar {
     }
 }
 
+input type:touchpad {
+    tap enabled
+}
+
 include /etc/sway/config.d/*

.config/sway/fancelock.sh

@@ -3,22 +3,21 @@
 # based on https://gist.github.com/singulared/7c6d53c1b84fbb7cf22d07c5c7d3e945?permalink_comment_id=3179677#gistcomment-3179677
 
 swayidle \
-    timeout 14 'swaymsg "output * dpms off" ; ssh sp3 DISPLAY=:0 xset dpms force off' \
+    timeout 14 'swaymsg "output * dpms off"' \
-    resume 'swaymsg "output * dpms on" ; ssh sp3 "export DISPLAY=:0 && xset dpms 0 0 0 && xset -dpms  && xset s off && xset s noblank"' &
+    resume 'swaymsg "output * dpms on"' &
  
 IMAGE=/tmp/i3lock.png
 LOCK=~/stow/bin/assets/stop.png
 LOCKARGS=" --ring-color 1108ee08 \
 	--inside-color 1108ee02 \
-	--indicator-x-position 1343 \
-	--indicator-y-position 680 \
 	--indicator-radius 220 \
 	--indicator-thickness 20 \
 	--ring-clear-color 1100ff10 \
 	--inside-clear-color 1f41ff70 \
 	--ring-wrong-color ff000010 \
 	--inside-clear-color ff212f70 \
-	--key-hl-color 1111f160 "
+	--key-hl-color 1111f160 \
+    --fingerprint"
 
 for OUTPUT in `swaymsg -t get_outputs | jq -r '.[] | select(.active == true) | .name'`
 do

.config/tmux/tmux.conf

@@ -0,0 +1,4 @@
+setw -g mode-keys vi
+set -sg escape-time 0
+bind-key -T copy-mode-vi 'v' send -X begin-selection
+bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel

.config/wluma/config.toml

@@ -0,0 +1,30 @@
+[als.iio]
+path = "/sys/bus/iio/devices"
+thresholds = { 0 = "night", 20 = "dark", 80 = "dim", 250 = "normal", 500 = "bright", 800 = "outdoors" }
+
+# [als.webcam]
+# video = 0
+# thresholds = { 0 = "night", 15 = "dark", 30 = "dim", 45 = "normal", 60 = "bright", 75 = "outdoors" }
+
+# [als.time]
+# thresholds = { 0 = "night", 7 = "dark", 9 = "dim", 11 = "normal", 13 = "bright", 16 = "normal", 18 = "dark", 20 = "night" }
+
+# [als.none]
+
+[[output.backlight]]
+name = "eDP-1"
+path = "/sys/class/backlight/amdgpu_bl1"
+capturer = "wlroots"
+
+# [[output.ddcutil]]
+# name = "Dell Inc. DELL P2415Q"
+# capturer = "none"
+
+#[[keyboard]]
+#name = "keyboard-dell"
+#path = "/sys/bus/platform/devices/dell-laptop/leds/dell::kbd_backlight"
+
+# [[keyboard]]
+# name = "keyboard-thinkpad"
+# path = "/sys/bus/platform/devices/thinkpad_acpi/leds/tpacpi::kbd_backlight"
+

.zshenv

@@ -1 +0,0 @@
-. "$HOME/.cargo/env"

.zshrc

@@ -25,6 +25,8 @@ export PATH=$PATH:$HOME/.local/bin
 
 export PATH=$PATH:$HOME/.nix-profile/bin
 
+export PATH=$PATH:$HOME/.cargo/bin
+
 # from mac
 PS1='%(?.%F{green}%?%f.%F{red}%?%f) %2~ %# '
 RPROMPT='%D{%l%M.%S}'
@@ -48,5 +50,76 @@ export GTK_THEME=Adwaita:dark
 
 export MOZ_ENABLE_WAYLAND=1
 
+# firefox screenshare
+# https://github.com/emersion/xdg-desktop-portal-wlr/wiki/%22It-doesn't-work%22-Troubleshooting-Checklist
+export XDG_CURRENT_DESKTOP=sway 
+
 alias of="onefetch --no-color-palette --no-art --no-title --disabled-fields=churn"
 alias sws="static-web-server -p 8080 -d ."
+
+# this does not if accessing a git repo thru a symlink
+function git-subdir() {
+    local root=$(git rev-parse --show-toplevel)
+    # get top level folder within git
+    echo "${PWD#"$root"}"
+}
+
+function jobrog_git_tag() {
+    git-subdir | tr '/' '\n' | tail -n +2 | head -n $1 | xargs -I {} echo -n "-t {} "
+}
+
+# jobrog porcelain
+# mainly adds git integration
+function grog() {
+    local root=$(git rev-parse --show-toplevel)
+    job -d $root $@
+}
+function start() {
+    grog a $(jobrog_git_tag 2) $@
+}
+function stop() {
+    grog d $@
+}
+function todo() {
+    grog n $(jobrog_git_tag 2) -t todo $@
+}
+function todos() {
+    grog s -n -t $(jobrog_git_tag 2) -t todo -T done $@
+}
+function did() {
+        local rx=$1; shift
+        grog tag -fnt todo -T done --rx $rx -a done $*
+}
+
+alias j=just
+alias n="fzf --print0 | xargs -0 -r -o nvim"
+
+alias dy="dig +short @dns.toys"
+
+# I can explain
+alias cargo="cargo mommy"
+export CARGO_MOMMYS_LITTLE="boy/puppy/dumbass/rustacean"
+export CARGO_MOMMYS_EMOTES="<3/:)/❤️/💖/💗/💓/💞/"
+export CARGO_MOMMYS_MOODS="ominous/chill/chill"
+export CARGO_MOMMYS_ROLES="ferris/ferris/ferris/mommy"
+export CARGO_MOMMYS_PRONOUNS="its"
+
+alias dup='dust -sHbrz 1'
+
+export FZF_DEFAULT_COMMAND='rg --files --hidden'
+
+alias rd="env -u WAYLAND_DISPLAY renderdoccmd capture"
+
+alias jsp='curl -X POST -H "Content-Type: application/json"'
+
+export PATH=$PATH:$HOME/.gradle/toolchains/frc/2023/roborio/bin
+export PATH=$PATH:$HOME/.gradle/toolchains/frc/2024/roborio/bin
+
+function timetravel() {
+    restic restore latest -r /hdd/restic --target=/ --include=`pwd`/$1
+}
+
+export OPENSSL_LIB_DIR=/usr/lib/openssl-1.1
+export OPENSSL_INCLUDE_DIR=/usr/include/openssl-1.1
+export WLR_DRM_NO_MODIFIERS=1
+export QT_QPA_PLATFORM=wayland

README.md

@@ -9,7 +9,3 @@ Note that `push.sh` overwrites your system's config files, if you aren't a full
 - `synced` - list of tracked files
 - `pull.sh` - updates repository from computer
 - `push.sh` - updates computer from repository
-- `nvimsubtree.sh` - updates my [init.vim](https://github.com/Speedy6451/init.vim) repository
-    - `./nvimsubtree.sh pull --squash` - update from github
-    - `./nvimsubtree.sh push` - push to github
-- `./**` - tracked files

cat

@@ -0,0 +1 @@
+188 /sys/class/backlight/amdgpu_bl1/brightness

synced

@@ -1,12 +1,13 @@
 .config/nvim/init.vim
 .config/nvim/coc-settings.json
-.config/alacritty.yml
+.config/alacritty.toml
 .config/sway/config
 .config/sway/lock.sh
 .config/sway/fancelock.sh
 .config/i3status-rust/config.toml
 .config/helix/config.toml
 .config/helix/languages.toml
+.config/tmux/tmux.conf
 .zshrc
-.zshenv
 .vitetris
+.config/wluma/config.toml