Compare commits

...
9 Commits
8 changed files with 55 additions and 28 deletions
+1
View File
@@ -11,6 +11,7 @@ export_paths+=("${HOME}/dotfiles/scripts")
export_paths+=("${HOME}/dotfiles/desktop-files") export_paths+=("${HOME}/dotfiles/desktop-files")
export_paths+=("/opt/jlink") export_paths+=("/opt/jlink")
export_paths+=("${HOME}/.cargo/bin") export_paths+=("${HOME}/.cargo/bin")
export_paths+=("/opt/arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi/bin")
for entry in ${export_paths[@]}; do for entry in ${export_paths[@]}; do
if ! [[ -d "${entry}" ]]; then if ! [[ -d "${entry}" ]]; then
+8 -1
View File
@@ -16,7 +16,7 @@ background-opacity = 1.0
selection-invert-fg-bg = true selection-invert-fg-bg = true
window-decoration = server window-decoration = server
mouse-scroll-multiplier = 1.0 mouse-scroll-multiplier = precision:1.0,discrete:1
app-notifications = no-clipboard-copy app-notifications = no-clipboard-copy
copy-on-select = false copy-on-select = false
@@ -24,4 +24,11 @@ clipboard-paste-protection = false
clipboard-read = allow clipboard-read = allow
clipboard-write = allow clipboard-write = allow
# unbind keybindings
keybind = alt+one=unbind
keybind = alt+two=unbind
keybind = alt+three=unbind
keybind = alt+four=unbind
# custom theme!
theme = zegonix theme = zegonix
+1 -1
View File
@@ -22,4 +22,4 @@
oneline = log \ oneline = log \
-n 20 \ -n 20 \
--pretty='tformat:%C(yellow)%h %C(blue)%as%C(auto)%d %C(reset)%s' --pretty='tformat:%C(yellow)%h %C(brightblue)%<(8,trunc)%an %C(blue)%as%C(auto)%d %C(reset)%s'
+2 -1
View File
@@ -168,8 +168,9 @@ bindsym $mod+o move workspace to output up
bindsym $mod+p move workspace to output right bindsym $mod+p move workspace to output right
# take screenshots # take screenshots
bindsym $mod+s exec --no-startup-id bash x11-screenshot.sh --clipboard bindsym $mod+s exec --no-startup-id bash x11-screenshot.sh "clipboard"
bindsym $mod+Shift+s exec --no-startup-id bash x11-screenshot.sh bindsym $mod+Shift+s exec --no-startup-id bash x11-screenshot.sh
bindsym $mod+c exec --no-startup-id bash x11-screenshot.sh "colour"
# use pactl for media keys # use pactl for media keys
set $refresh_i3status killall -SIGUSR1 i3status set $refresh_i3status killall -SIGUSR1 i3status
@@ -1,7 +1,6 @@
return { return {
"nvim-telescope/telescope.nvim", "nvim-telescope/telescope.nvim",
event = "VimEnter", event = "VimEnter",
branch = "0.1.x",
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
{ -- If encountering errors, see telescope-fzf-native README for installation instructions { -- If encountering errors, see telescope-fzf-native README for installation instructions
+1 -8
View File
@@ -56,7 +56,7 @@ separator-foreground = ${colors.background}
font-0 = "Jet Brains Mono Nerd Font:size=14:weight=Bold;2" font-0 = "Jet Brains Mono Nerd Font:size=14:weight=Bold;2"
modules-left = xworkspaces xwindow modules-left = xworkspaces xwindow
modules-right = xkeyboard pulseaudio cpu eth date modules-right = xkeyboard pulseaudio eth date
cursor-click = pointer cursor-click = pointer
cursor-scroll = ns-resize cursor-scroll = ns-resize
@@ -162,13 +162,6 @@ format-prefix = "RAM "
format-prefix-foreground = ${colors.primary} format-prefix-foreground = ${colors.primary}
label = %percentage_used:2%% label = %percentage_used:2%%
[module/cpu]
type = internal/cpu
interval = 2
format-prefix = " "
format-prefix-foreground = ${colors.primary}
label = %percentage:2%%
[network-base] [network-base]
type = internal/network type = internal/network
interval = 5 interval = 5
Executable → Regular
+4 -4
View File
@@ -6,7 +6,7 @@ function remove-whitespace {
exclude_paths=( exclude_paths=(
".git" ".git"
) )
exclude_files=( exclude_extensions=(
"*.lst" "*.lst"
"*.map" "*.map"
"*.svd" "*.svd"
@@ -97,16 +97,16 @@ function remove-whitespace {
fi fi
done done
excludes+=(")" "-type d" "-prune" "-o") excludes+=(")" "-type" "d" "-prune" "-o")
for arg in "${exclude_files[@]}"; do for arg in "${exclude_extensions[@]}"; do
excludes+=("-not" "-name" "${arg}") excludes+=("-not" "-name" "${arg}")
done done
for arg in "${path_args[@]}"; do for arg in "${path_args[@]}"; do
files=("$( files=("$(
find "${arg}" \ find "${arg}" \
${excludes[@]} \ "${excludes[@]}" \
-type f \ -type f \
-exec grep -EIq "${grep_regex}" {} \; \ -exec grep -EIq "${grep_regex}" {} \; \
-print -print
+38 -12
View File
@@ -1,12 +1,14 @@
#!/usr/bin/env bash #!/usr/bin/env bash
unset use_clipboard unset use_clipboard
if [[ "$1" == "-c" ]] || [[ "$1" == "--clipboard" ]]; then if [[ "$1" == "--clipboard" ]]; then
use_clipboard="true" use_clipboard="true"
elif [[ "$1" == "--colour" ]]; then
pick_colour="true"
fi fi
if ! $(which maim &>/dev/null); then if ! $(which slop &>/dev/null); then
notify-send "[screenshot]" "missing \`maim\`" notify-send "[screenshot]" "missing \`slop\`"
exit 1 exit 1
fi fi
if [[ -n "${use_clipboard}" ]] && ! $(which xclip &>/dev/null); then if [[ -n "${use_clipboard}" ]] && ! $(which xclip &>/dev/null); then
@@ -14,13 +16,37 @@ if [[ -n "${use_clipboard}" ]] && ! $(which xclip &>/dev/null); then
exit 1 exit 1
fi fi
if [[ -z "${use_clipboard}" ]]; then screenshots_path="${HOME}/screenshots"
screenshots_path="${HOME}/screenshots" if [[ ! -d "${screenshots_path}" ]]; then
echo "${screenshots_path}" mkdir "${screenshots_path}"
if [[ ! -d "${screenshots_path}" ]]; then
mkdir "${screenshots_path}"
fi
maim -suo "${screenshots_path}/$(date '+%Y%m%d_%H%M%S').png"
else
maim -suo | xclip -selection clipboard -t image/png
fi fi
temp_file="${screenshots_path}/temporary.png"
maim -suo -f png -t 0 "${temp_file}"
# meh!
function colour_picker {
colour_value="$(magick "${temp_file}" -scale 1x1\! -format "#%[hex:p{0,0}]" info:)"
notify-send "[colour picker]" "${colour_value}"
echo "${colour_value}" | xclip -selection clipboard
remove_temporary_file
}
function clipboard {
xclip -selection clipboard -t image/png <"${temp_file}"
remove_temporary_file
}
function save_screenshot {
mv "${temp_file}" "${screenshots_path}/$(date '+%Y%m%d_%H%M%S').png"
}
function remove_temporary_file {
rm "${temp_file}"
}
case "$1" in
"clipboard") clipboard ;;
"colour") colour_picker ;;
*) save_screenshot ;;
esac