diff --git a/backgrounds/wallhaven-xlqx8z.png b/backgrounds/wallhaven-xlqx8z.png new file mode 100644 index 0000000..aa0aad1 Binary files /dev/null and b/backgrounds/wallhaven-xlqx8z.png differ diff --git a/dots/helix/config.toml b/dots/helix/config.toml index 86c3e80..084023c 100644 --- a/dots/helix/config.toml +++ b/dots/helix/config.toml @@ -53,4 +53,4 @@ F7 = ":insert-output date '+%a %F'" #"A-," = { "," = "search" } # Create homing key for %!%! #"A-," = { "m" = ":append-output python ~/.scripts/testing/pymark.py numlist 20 %!%!" } -A-b = { l = ":sh xelatex *tex > /dev/null" } # Build latex \ No newline at end of file +A-b = { l = ":sh xelatex *tex > /dev/null" } \ No newline at end of file diff --git a/dots/helix/languages.toml b/dots/helix/languages.toml index 741d692..63f07cd 100644 --- a/dots/helix/languages.toml +++ b/dots/helix/languages.toml @@ -11,7 +11,21 @@ name = "common-lisp" auto-format = true file-types = ["yuck"] +[[language]] +name = "scheme" +auto-format = true +file-types = ["scm"] + [[language]] name = "markdown" formatter = { command = "prettier", args = ["--parser", "markdown"] } auto-format = true + +[[language]] +name = "spec" +roots = [] +injection-regex = "spec" +scope = "source.spec" +file-types = ["spec"] +comment-token = "#" + diff --git a/dots/lf/functions b/dots/lf/functions index 08ade50..b438399 100644 --- a/dots/lf/functions +++ b/dots/lf/functions @@ -22,6 +22,11 @@ cmd playlist ${{ done }} +# Create playlist file out of list of selected items. +cmd clipfile ${{ + wl-copy < "${f}" +}} + # Use FD to find directory and then cd to said directory in current lf instance. cmd fdcd ${{ full=$(sk -c "fd -t f -t d --search-path ~" --layout=reverse --header="Seach for the files or directory you wish to be in." --color="header:5" --preview="~/.config/lf/miniscope.sh {+}") diff --git a/dots/lf/lfrc b/dots/lf/lfrc index f6b1fc4..d73eef2 100644 --- a/dots/lf/lfrc +++ b/dots/lf/lfrc @@ -32,6 +32,7 @@ map is set info size # Custom binds map fdcd +map clipfile source ~/.config/lf/functions diff --git a/dots/qutebrowser/qsettings/QtProject.conf b/dots/qutebrowser/qsettings/QtProject.conf deleted file mode 100644 index 4080fd2..0000000 --- a/dots/qutebrowser/qsettings/QtProject.conf +++ /dev/null @@ -1,8 +0,0 @@ -[FileDialog] -history=file:///home/josh, file:///home/josh/Captures, file:///home/josh/Downloads, file:///home/josh/Docs/keys -lastVisited=file:///home/josh/Captures -qtVersion=5.15.8 -shortcuts=file:, file:///home/josh -sidebarWidth=90 -treeViewHeader=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x3\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\xec\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\xff\0\0\0\x1\0\0\0\0\0\0\0?\0\0\0\x1\0\0\0\0\0\0\0@\0\0\0\x1\0\0\0\0\0\0\0n\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\xff\xff\xff\xff) -viewMode=Detail diff --git a/dots/qutebrowser/search.py b/dots/qutebrowser/search.py index e97ef54..1184fd7 100644 --- a/dots/qutebrowser/search.py +++ b/dots/qutebrowser/search.py @@ -9,7 +9,7 @@ c.url.searchengines = { 'cdj': 'https://www.cantonese.sheik.co.uk/dictionary/search/?searchtype=3&text={}', 'cde': 'https://www.cantonese.sheik.co.uk/dictionary/search/?searchtype=4&text={}', 'cdw': 'https://www.cantonese.sheik.co.uk/dictionary/search/?searchtype=1&text={}', - 'yt': 'https://inv.riverside.rocks/search?q={}', + 'yt': 'https://inv.vern.cc/search?q={}', 'ebay': 'https://www.ebay.com/sch/i.html?_nkw={}', 'amazon': 'https://www.amazon.com/s?k={}', 'zhtea': 'https://duckduckgo.com/?q={}+site:jadepot.com.cn+OR+site:jadepot.com+OR+site:xuite.net+OR+site:teaart.com.tw+OR+site:potsart.com+OR+site:p9.com.tw+!g' diff --git a/dots/qutebrowser/theme.py b/dots/qutebrowser/theme.py index b2283bd..e855dba 100644 --- a/dots/qutebrowser/theme.py +++ b/dots/qutebrowser/theme.py @@ -36,3 +36,5 @@ c.colors.hints.match.fg = palette["pink"] c.colors.statusbar.insert.bg = palette["base"] c.colors.statusbar.insert.fg = palette["green"] +# Nuke defaultbg +c.colors.webpage.bg = "white" diff --git a/dots/rofi/config.rasi b/dots/rofi/config.rasi index 3f75914..1b0b1e7 100644 --- a/dots/rofi/config.rasi +++ b/dots/rofi/config.rasi @@ -13,12 +13,10 @@ configuration { display-ssh: "  SSH "; display-drun: "  Apps "; display-run: "  Run "; - display-window: " 﩯 Window "; - display-clipboard: "  Clip "; } @theme "catppuccin-frappe" // Overrides -* { font: "Hack 14"; } +* { font: "IntelOne Mono 14"; } window { border-radius: 10px; } diff --git a/dots/rofi/rofi_session.sh b/dots/rofi/rofi_session.sh index 7e5a31d..9f8b3b1 100755 --- a/dots/rofi/rofi_session.sh +++ b/dots/rofi/rofi_session.sh @@ -1,4 +1,6 @@ -MENU_OPTS=("Logout" "Shutdown" "Reboot" "Lock") +#!/bin/sh + +MENU_OPTS=("Logout" "Kexec" "Shutdown" "Reboot") if [ $# -eq 0 ]; then exit 1 @@ -29,5 +31,8 @@ case $SELECTION in reboot) verify "systemctl reboot" ;; + kexec) + verify "systemctl kexec" + ;; esac diff --git a/dots/sc-im/scimrc b/dots/sc-im/scimrc index 8b59f67..2587c73 100644 --- a/dots/sc-im/scimrc +++ b/dots/sc-im/scimrc @@ -9,6 +9,7 @@ nmap ",n" "\!!" # Wayland paste command set default_paste_from_clipboard_cmd="wl-paste" +set default_copy_to_clipboard_cmd="wl-copy <" # Setting basic input colors. color "type=CELL_CONTENT fg=BLUE bg=DEFAULT_COLOR bold=1" diff --git a/dots/sway/config.d/12-execs b/dots/sway/config.d/12-execs index 8a6f57d..5c7c7a5 100644 --- a/dots/sway/config.d/12-execs +++ b/dots/sway/config.d/12-execs @@ -6,4 +6,3 @@ exec foot --server exec "systemctl start --user foot-server@${WAYLAND_DISPLAY}" exec swayidle -w exec "tail -f $XDG_CONFIG_HOME/wob/volume | wob" -exec wl-paste -t text --watch clipman store --no-persist diff --git a/dots/sway/config.d/20-binds b/dots/sway/config.d/20-binds index 2e51df9..be063d2 100644 --- a/dots/sway/config.d/20-binds +++ b/dots/sway/config.d/20-binds @@ -29,6 +29,8 @@ bindsym { $mod+Shift+$dirD move down } +bindsym --locked $mod+Shift+i output * dpms on + # Layout bindsym { $mod+b splith @@ -59,7 +61,7 @@ bindsym { $mod+Return exec $term $mod+o exec $files $mod+d exec $menu - $mod+Shift+d exec clipman pick -t rofi + # $mod+Shift+d exec clipman pick -t rofi $mod+c exec $capture all $mod+Ctrl+c exec $capture screen $mod+Shift+c exec $capture region diff --git a/dots/sway/config.d/hosts/Hephaestus b/dots/sway/config.d/hosts/Hephaestus index ee4f36e..89c4d45 100644 --- a/dots/sway/config.d/hosts/Hephaestus +++ b/dots/sway/config.d/hosts/Hephaestus @@ -1,12 +1,7 @@ -set { - # Per system vars - $paper $HOME/Backgrounds/wallhaven-kwvy91.png - - # Monitors - $34uw 'ASUSTek COMPUTER INC ASUS VG34V M8LMTF099084' - $lg4k 'LG Electronics LG Ultra HD 0x00009F2F' +set $paper $HOME/Backgrounds/wallhaven-kwvy91.png -} +set $34uw 'ASUSTek COMPUTER INC ASUS VG34V M8LMTF099084' +set $lg4k 'LG Electronics LG Ultra HD 0x00009F2F' # Displays output '*' bg $paper fill diff --git a/dots/sway/config.d/hosts/Tylwyth b/dots/sway/config.d/hosts/Tylwyth index 7b002c8..a2e1620 100644 --- a/dots/sway/config.d/hosts/Tylwyth +++ b/dots/sway/config.d/hosts/Tylwyth @@ -1,6 +1,6 @@ set $panel 'IVO 0x8C78 0x00000004' -set $dock1 'IGM Communi L236VA VB045N9510940' -set $dock2 'Dell Inc. DELL U2412M 7XTXG78T1HGU' +set $dock1_1 'IGM Communi L236VA VB045N9510940' +set $dock1_2 'Dell Inc. DELL U2412M 7XTXG78T1HGU' set $bg '~/Backgrounds/wallhaven-28mpg6.png' @@ -21,11 +21,11 @@ output { resolution 1920x1080 position 0,0 } - $dock1 { + $dock1_1 { resolution 1920x1080 position 1920,0 } - $dock2 { + $dock1_2 { resolution 1920x1200 position 3840,0 } } diff --git a/dots/swayidle/config b/dots/swayidle/config index b44c632..5da5624 100644 --- a/dots/swayidle/config +++ b/dots/swayidle/config @@ -1,3 +1,3 @@ timeout 180 "swaymsg 'output * dpms off'" resume "swaymsg 'output * dpms on'" -timeout 300 "swaylock" +timeout 300 "swaylock" resume "swaymsg 'output * dpms on'" before-sleep "swaylock" diff --git a/dots/swaylock/Hephaestus b/dots/swaylock/Hephaestus deleted file mode 120000 index 447896f..0000000 --- a/dots/swaylock/Hephaestus +++ /dev/null @@ -1 +0,0 @@ -/home/josh/Backgrounds/wallhaven-kwvy91.png \ No newline at end of file diff --git a/dots/swaylock/Tylwyth b/dots/swaylock/Tylwyth deleted file mode 120000 index 8eac95e..0000000 --- a/dots/swaylock/Tylwyth +++ /dev/null @@ -1 +0,0 @@ -/home/josh/Backgrounds/wallhaven-28mpg6.png \ No newline at end of file diff --git a/dots/swaylock/config b/dots/swaylock/config index 03a5ff3..dc55515 100644 --- a/dots/swaylock/config +++ b/dots/swaylock/config @@ -4,7 +4,7 @@ show-failed-attempts # Allows scripts to just call swaylock #daemonize -image=$XDG_CONFIG_HOME/swaylock/$HOST +image=~/Backgrounds/wallhaven-xlqx8z.png scaling=fill font='Hack:style=Bold' diff --git a/dots/waybar/config b/dots/waybar/config index a2e73d7..fcc1e18 100644 --- a/dots/waybar/config +++ b/dots/waybar/config @@ -2,5 +2,5 @@ // includes all the main generic stuff. // Per-system changes are in the hostname conf { - "include": ["~/.config/waybar/hosts/$HOSTNAME"] + "include": ["~/.config/waybar/hosts/$HOST"] } \ No newline at end of file diff --git a/dots/waybar/generic b/dots/waybar/generic index cd5d41f..696d229 100644 --- a/dots/waybar/generic +++ b/dots/waybar/generic @@ -74,7 +74,7 @@ "interval": 120, "tooltip": false, "format": "{icon} {volume:3}%", - "format-muted": "󰸈 {volume:3}%", + "format-muted": "󰖁 {volume:3}%", "format-icons": { "default": ["󰖀", "󰕾"] } diff --git a/dots/waybar/hosts/Tylwyth b/dots/waybar/hosts/Tylwyth index 9034032..cce3342 100644 --- a/dots/waybar/hosts/Tylwyth +++ b/dots/waybar/hosts/Tylwyth @@ -20,7 +20,7 @@ }, "tooltip": false, "format": "{icon}", - "format-icons": ["", "", "", "", ""] + "format-icons": ["󰁻", "󰁽", "󰁿", "󰂁", "󰁹"] }, // Thermal zone 0 is the same as k10temp. @@ -28,6 +28,6 @@ "temperature#1": { "thermal-zone": 0, "critical-threshold": 80, - "format": "{temperatureC:3}°", + "format": "󰈸{temperatureC:3}°", }, } diff --git a/dots/waybar/style.css b/dots/waybar/style.css index 90967ce..1fc077a 100644 --- a/dots/waybar/style.css +++ b/dots/waybar/style.css @@ -2,7 +2,7 @@ * { border-radius: 0px ; - font-family: "Hack", "JetBrainsMono NF", "HanWangKanTan" ; + font-family: "Hack", "Symbols Nerd Font Mono", "HanWangKanTan" ; font-size: 16px ; font-weight: 600 ; padding: 0px ; @@ -26,30 +26,32 @@ window#waybar { background-color: transparent ; - border-bottom: 1px transparent solid ; + border: unset ; } #workspaces button, #tags button { - padding: 0 12px ; color: @overlay0 ; - border: 1px transparent ; + border: unset ; transition: none ; } -#workspaces button:hover, #tags button:hover { - box-shadow: inherit ; - text-shadow: inherit ; - background: inherit ; - border: 1px transparent ; +#workspaces button { + padding: 0 12px ; } -#workspaces button:active, #tags button.occupied { - box-shadow: inherit ; - text-shadow: inherit ; - background-color: transparent ; +#tags button { + padding: 0 4px ; } -#workspaces button.visible { +#workspaces button:hover, #tags button:hover, + #workspaces button:active { + box-shadow: unset ; + text-shadow: unset ; + background: unset ; + border: unset ; + } + +#workspaces button.visible, #tags button.occupied { color: @subtext0 ; }