diff --git a/executable_dot_aliasrc b/executable_dot_aliasrc index f24751f..1f87617 100644 --- a/executable_dot_aliasrc +++ b/executable_dot_aliasrc @@ -1,4 +1,10 @@ #!/bin/sh + +lfcd () { + # `command` is needed in case `lfcd` is aliased to `lf` + cd "$(command lf -print-last-dir "$@")" +} + load_aliases() { local TIMEFMT='\%J\n%mE:' local OLDPATH=$PATH @@ -122,6 +128,7 @@ load_aliases() { # fi # } fi + } load_aliases unset -f load_aliases diff --git a/executable_dot_env b/executable_dot_env index feb07e4..356aeb0 100644 --- a/executable_dot_env +++ b/executable_dot_env @@ -14,7 +14,9 @@ XDG_DATA_HOME="$HOME/.local/share" XDG_CONFIG_HOME="$HOME/.config" XDG_STATE_HOME="$HOME/.local/state" XDG_CACHE_HOME="$HOME/.cache" - +source "$XDG_CONFIG_HOME/user-dirs.dirs" +EDITOR=nvim +OPENER=xdg-open # [[ "$TERM_PROGRAM" = "vscode" ]] && . "$(code --locate-shell-integration-path $0)" # set PATH so it includes user's private bin if it exists diff --git a/executable_dot_zshrc b/executable_dot_zshrc index c097c64..4c5f951 100644 --- a/executable_dot_zshrc +++ b/executable_dot_zshrc @@ -183,7 +183,7 @@ fi # Set up broot if installed (a nicer tree, probably has other cool stuff I haven't looked at yet) -[ -e "$HOME"/.config/broot/launcher/bash/br ] && zsh-defer -t 5 eval "$(broot --print-shell-function zsh)" +# [ -e "$HOME"/.config/broot/launcher/bash/br ] && zsh-defer -t 5 eval "$(broot --print-shell-function zsh)" # Set aliases [ -f "$HOME/.aliasrc" ] && source "$HOME/.aliasrc" # >/dev/null 2>&1 &; diff --git a/private_dot_config/alacritty/alacritty.yml b/private_dot_config/alacritty/alacritty.yml index c9189b0..94a4e33 100644 --- a/private_dot_config/alacritty/alacritty.yml +++ b/private_dot_config/alacritty/alacritty.yml @@ -450,8 +450,8 @@ colors: # Default: # - (Linux/BSD/macOS) `$SHELL` or the user's login shell, if `$SHELL` is unset # - (Windows) powershell -shell: - program: /bin/bash +# shell: + # program: /bin/bash # args: # - --login diff --git a/private_dot_config/external_nvim b/private_dot_config/external_nvim index 7373fe5..a1fadfc 160000 --- a/private_dot_config/external_nvim +++ b/private_dot_config/external_nvim @@ -1 +1 @@ -Subproject commit 7373fe5cb8013bf0705a2d3d6e3b918c06eae1b4 +Subproject commit a1fadfc52546b6b295d9e439a17d54da460e818b diff --git a/private_dot_config/lf/lfrc b/private_dot_config/lf/lfrc new file mode 100644 index 0000000..7f4778b --- /dev/null +++ b/private_dot_config/lf/lfrc @@ -0,0 +1,73 @@ +set hidden! +set shell zsh +set mouse + +cmd open ${{ + case $(file --mime-type "$f" -bL) in + text/*|application/json) $EDITOR "$f";; + video/*|image/*|/application/pdf) $OPENER "$f" & disown;; + *) $OPENER "$f" ;; + esac +}} + +# trash +cmd trash %trash-put $fx +map dd trash +map DD delete + + +# make file/dir +cmd mkdir %{{ + echo "Name: " + read ans + if [[ "$ans" == */ ]]; then + mkdir -p "$ans"; + else + mkdir -p "$(dirname $ans)"; + touch "$ans"; + fi +}} + +map a mkdir + +cmd sudo_mkdir ${{ + echo "Name: " + read ans + if [[ "$ans" == */ ]]; then + sudo mkdir -p "$ans"; + else + sudo mkdir -p "$(dirname $ans)"; + sudo touch "$ans"; + fi +}} +map A sudo_mkdir + + +# fzf search +cmd fzf_jump ${{ + res="$(find . -maxdepth 3 | fzf --reverse --header='Jump to location')" + if [ -n "$res" ]; then + if [ -d "$res" ]; then + cmd="cd" + else + cmd="select" + fi + res="$(printf '%s' "$res" | sed 's/\\/\\\\/g;s/"/\\"/g')" + lf -remote "send $id $cmd \"$res\"" + fi +}} +map :fzf_jump + +cmd unarchive ${{ + case "$f" in + *.zip) unzip "$f" ;; + *.tar*) tar -xvf "$f" ;; + *) echo "Unsupported format" ;; +}} + +cmd zip %zip -r "$f" "$f" +cmd xz %tar -cJvf "$f.tar.xz" "$f" +cmd gz %tar -czvf "$f.tar.gz" "$f" +cmd zstd %tar -cvf --zstd "$f.tar.zst" "$f" + +map au unarchive diff --git a/private_dot_config/private_user-dirs.dirs b/private_dot_config/private_user-dirs.dirs new file mode 100644 index 0000000..7f9a959 --- /dev/null +++ b/private_dot_config/private_user-dirs.dirs @@ -0,0 +1,15 @@ +# This file is written by xdg-user-dirs-update +# If you want to change or add directories, just edit the line you're +# interested in. All local changes will be retained on the next run. +# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped +# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an +# absolute path. No other format is supported. +# +XDG_DESKTOP_DIR="$HOME/Desktop" +XDG_DOWNLOAD_DIR="$HOME/Downloads" +XDG_TEMPLATES_DIR="$HOME/Templates" +XDG_PUBLICSHARE_DIR="$HOME/Public" +XDG_DOCUMENTS_DIR="$HOME/Documents" +XDG_MUSIC_DIR="$HOME/Music" +XDG_PICTURES_DIR="$HOME/Pictures" +XDG_VIDEOS_DIR="$HOME/Videos" diff --git a/private_dot_config/rofi/config.rasi b/private_dot_config/rofi/config.rasi new file mode 100644 index 0000000..807768d --- /dev/null +++ b/private_dot_config/rofi/config.rasi @@ -0,0 +1,155 @@ +configuration { +modes: "window,drun,run,ssh,combi"; +font: "Atkinson Hyperlegible 12"; +/* location: 0;*/ +/* yoffset: 0;*/ +/* xoffset: 0;*/ +/* fixed-num-lines: true;*/ +/* show-icons: false;*/ +/* terminal: "rofi-sensible-terminal";*/ +/* ssh-client: "ssh";*/ +/* ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]";*/ +/* run-command: "{cmd}";*/ +/* run-list-command: "";*/ +/* run-shell-command: "{terminal} -e {cmd}";*/ +/* window-command: "wmctrl -i -R {window}";*/ +/* window-match-fields: "all";*/ +/* icon-theme: ;*/ +/* drun-match-fields: "name,generic,exec,categories,keywords";*/ +/* drun-categories: ;*/ +/* drun-show-actions: false;*/ +/* drun-display-format: "{name} [({generic})]";*/ +/* drun-url-launcher: "xdg-open";*/ +/* disable-history: false;*/ +/* ignored-prefixes: "";*/ +/* sort: false;*/ +/* sorting-method: "normal";*/ +/* case-sensitive: false;*/ +/* cycle: true;*/ +/* sidebar-mode: false;*/ +/* hover-select: false;*/ +/* eh: 1;*/ +/* auto-select: false;*/ +/* parse-hosts: false;*/ +/* parse-known-hosts: true;*/ +/* combi-modes: "window,run";*/ +/* matching: "normal";*/ +/* tokenize: true;*/ +/* m: "-5";*/ +/* filter: ;*/ +/* dpi: -1;*/ +/* threads: 0;*/ +/* scroll-method: 0;*/ +/* window-format: "{w} {c} {t}";*/ +/* click-to-exit: true;*/ +/* max-history-size: 25;*/ +/* combi-hide-mode-prefix: false;*/ +/* combi-display-format: "{mode} {text}";*/ +/* matching-negate-char: '-' /* unsupported */;*/ +/* cache-dir: ;*/ +/* window-thumbnail: false;*/ +/* drun-use-desktop-cache: false;*/ +/* drun-reload-desktop-cache: false;*/ +/* normalize-match: false;*/ +/* steal-focus: false;*/ +/* application-fallback-icon: ;*/ +/* refilter-timeout-limit: 300;*/ +/* xserver-i300-workaround: false;*/ +/* completer-mode: "recursivebrowser";*/ +/* pid: "/run/user/1000/rofi.pid";*/ +/* display-window: ;*/ +/* display-run: ;*/ +/* display-ssh: ;*/ +/* display-drun: ;*/ +/* display-combi: ;*/ +/* display-keys: ;*/ +/* display-filebrowser: ;*/ +/* display-recursivebrowser: ;*/ +/* kb-primary-paste: "Control+V,Shift+Insert";*/ +/* kb-secondary-paste: "Control+v,Insert";*/ +/* kb-secondary-copy: "Control+c";*/ +/* kb-clear-line: "Control+w";*/ +/* kb-move-front: "Control+a";*/ +/* kb-move-end: "Control+e";*/ +/* kb-move-word-back: "Alt+b,Control+Left";*/ +/* kb-move-word-forward: "Alt+f,Control+Right";*/ +/* kb-move-char-back: "Left,Control+b";*/ +/* kb-move-char-forward: "Right,Control+f";*/ +/* kb-remove-word-back: "Control+Alt+h,Control+BackSpace";*/ +/* kb-remove-word-forward: "Control+Alt+d";*/ +/* kb-remove-char-forward: "Delete,Control+d";*/ +/* kb-remove-char-back: "BackSpace,Shift+BackSpace,Control+h";*/ +/* kb-remove-to-eol: "Control+k";*/ +/* kb-remove-to-sol: "Control+u";*/ +/* kb-accept-entry: "Control+j,Control+m,Return,KP_Enter";*/ +/* kb-accept-custom: "Control+Return";*/ +/* kb-accept-custom-alt: "Control+Shift+Return";*/ +/* kb-accept-alt: "Shift+Return";*/ +/* kb-delete-entry: "Shift+Delete";*/ +/* kb-mode-next: "Shift+Right,Control+Tab";*/ +/* kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab";*/ +/* kb-mode-complete: "Control+l";*/ +/* kb-row-left: "Control+Page_Up";*/ +/* kb-row-right: "Control+Page_Down";*/ +/* kb-row-up: "Up,Control+p";*/ +/* kb-row-down: "Down,Control+n";*/ +/* kb-row-tab: "";*/ +/* kb-element-next: "Tab";*/ +/* kb-element-prev: "ISO_Left_Tab";*/ +/* kb-page-prev: "Page_Up";*/ +/* kb-page-next: "Page_Down";*/ +/* kb-row-first: "Home,KP_Home";*/ +/* kb-row-last: "End,KP_End";*/ +/* kb-row-select: "Control+space";*/ +/* kb-screenshot: "Alt+S";*/ +/* kb-ellipsize: "Alt+period";*/ +/* kb-toggle-case-sensitivity: "grave,dead_grave";*/ +/* kb-toggle-sort: "Alt+grave";*/ +/* kb-cancel: "Escape,Control+g,Control+bracketleft";*/ +/* kb-custom-1: "Alt+1";*/ +/* kb-custom-2: "Alt+2";*/ +/* kb-custom-3: "Alt+3";*/ +/* kb-custom-4: "Alt+4";*/ +/* kb-custom-5: "Alt+5";*/ +/* kb-custom-6: "Alt+6";*/ +/* kb-custom-7: "Alt+7";*/ +/* kb-custom-8: "Alt+8";*/ +/* kb-custom-9: "Alt+9";*/ +/* kb-custom-10: "Alt+0";*/ +/* kb-custom-11: "Alt+exclam";*/ +/* kb-custom-12: "Alt+at";*/ +/* kb-custom-13: "Alt+numbersign";*/ +/* kb-custom-14: "Alt+dollar";*/ +/* kb-custom-15: "Alt+percent";*/ +/* kb-custom-16: "Alt+dead_circumflex";*/ +/* kb-custom-17: "Alt+ampersand";*/ +/* kb-custom-18: "Alt+asterisk";*/ +/* kb-custom-19: "Alt+parenleft";*/ +/* kb-select-1: "Super+1";*/ +/* kb-select-2: "Super+2";*/ +/* kb-select-3: "Super+3";*/ +/* kb-select-4: "Super+4";*/ +/* kb-select-5: "Super+5";*/ +/* kb-select-6: "Super+6";*/ +/* kb-select-7: "Super+7";*/ +/* kb-select-8: "Super+8";*/ +/* kb-select-9: "Super+9";*/ +/* kb-select-10: "Super+0";*/ +/* kb-entry-history-up: "Control+Up";*/ +/* kb-entry-history-down: "Control+Down";*/ +/* ml-row-left: "ScrollLeft";*/ +/* ml-row-right: "ScrollRight";*/ +/* ml-row-up: "ScrollUp";*/ +/* ml-row-down: "ScrollDown";*/ +/* me-select-entry: "MousePrimary";*/ +/* me-accept-entry: "MouseDPrimary";*/ +/* me-accept-custom: "Control+MouseDPrimary";*/ + timeout { + action: "kb-cancel"; + delay: 0; + } + filebrowser { + directories-first: true; + sorting-method: "name"; + } +} diff --git a/private_dot_config/rofi/lunar-witch.rasi b/private_dot_config/rofi/lunar-witch.rasi new file mode 100644 index 0000000..5434036 --- /dev/null +++ b/private_dot_config/rofi/lunar-witch.rasi @@ -0,0 +1,174 @@ +/** + * rofi -dump-theme output. + * Rofi version: 1.7.5+wayland2-dev + **/ +* { + red: #A04558; + blue: #334773; + background: #1E1B30; + lightbg: #2A2644; + foreground: #BFBFC0; + lightfg: #BFBFC0; + spacing: 1; + selected-active-foreground: var(background); + separatorcolor: var(foreground); + urgent-foreground: var(red); + alternate-urgent-background: var(lightbg); + background-color: transparent; + border-color: var(foreground); + normal-background: var(background); + selected-urgent-background: var(red); + alternate-active-background: var(lightbg); + alternate-normal-foreground: var(foreground); + urgent-background: var(background); + selected-normal-foreground: var(lightbg); + active-foreground: var(blue); + selected-active-background: var(blue); + active-background: var(background); + selected-normal-background: var(lightfg); + alternate-normal-background: var(lightbg); + selected-urgent-foreground: var(background); + normal-foreground: var(foreground); + alternate-urgent-foreground: var(red); + alternate-active-foreground: var(blue); +} +element { + padding: 1px ; + cursor: pointer; + spacing: 5px ; + border: 0; +} +element normal.normal { + background-color: var(normal-background); + text-color: var(normal-foreground); +} +element normal.urgent { + background-color: var(urgent-background); + text-color: var(urgent-foreground); +} +element normal.active { + background-color: var(active-background); + text-color: var(active-foreground); +} +element selected.normal { + background-color: var(selected-normal-background); + text-color: var(selected-normal-foreground); +} +element selected.urgent { + background-color: var(selected-urgent-background); + text-color: var(selected-urgent-foreground); +} +element selected.active { + background-color: var(selected-active-background); + text-color: var(selected-active-foreground); +} +element alternate.normal { + background-color: var(alternate-normal-background); + text-color: var(alternate-normal-foreground); +} +element alternate.urgent { + background-color: var(alternate-urgent-background); + text-color: var(alternate-urgent-foreground); +} +element alternate.active { + background-color: var(alternate-active-background); + text-color: var(alternate-active-foreground); +} +element-text { + background-color: transparent; + cursor: inherit; + highlight: inherit; + text-color: inherit; +} +element-icon { + background-color: transparent; + size: 1.0000em ; + cursor: inherit; + text-color: inherit; +} +window { + padding: 5; + background-color: var(background); + border: 0; + border-radius: 8px; +} +mainbox { + padding: 0.1em; + border: 0; +} +message { + padding: 1px ; + border-color: var(separatorcolor); + border: 2px dash 0px 0px ; +} +textbox { + text-color: var(foreground); +} +listview { + padding: 2px 0px 0px ; + scrollbar: true; + border-color: var(separatorcolor); + spacing: 2px ; + fixed-height: 0; + border: 2px solid 0px 0px ; +} +scrollbar { + width: 4px ; + padding: 0; + handle-width: 8px ; + border: 0; + handle-color: var(normal-foreground); +} +sidebar { + border-color: var(separatorcolor); + border: 2px dash 0px 0px ; +} +button { + cursor: pointer; + spacing: 0; + text-color: var(normal-foreground); +} +button selected { + background-color: var(selected-normal-background); + text-color: var(selected-normal-foreground); +} +num-filtered-rows { + expand: false; + text-color: Gray; +} +num-rows { + expand: false; + text-color: Gray; +} +textbox-num-sep { + expand: false; + str: "/"; + text-color: Gray; +} +inputbar { + padding: 1px ; + spacing: 0px ; + text-color: var(normal-foreground); + children: [ "prompt","textbox-prompt-colon","entry","num-filtered-rows","textbox-num-sep","num-rows","case-indicator" ]; +} +case-indicator { + spacing: 0; + text-color: var(normal-foreground); +} +entry { + text-color: var(normal-foreground); + cursor: text; + spacing: 0; + placeholder-color: Gray; + placeholder: "Type to filter"; +} +prompt { + spacing: 0; + text-color: var(normal-foreground); +} +textbox-prompt-colon { + margin: 0px 0.3000em 0.0000em 0.0000em ; + expand: false; + str: ":"; + text-color: inherit; +} diff --git a/private_dot_config/sway/config b/private_dot_config/sway/config index 433685b..9621037 100644 --- a/private_dot_config/sway/config +++ b/private_dot_config/sway/config @@ -33,6 +33,8 @@ set $ws28 "28" set $ws29 "29" set $ws20 "20" +exec hash dbus-update-activation-environment 2>/dev/null && \ + dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway include "keybinds" #border size @@ -41,5 +43,5 @@ default_border normal 1 # polkit exec_always --no-startup-id /usr/bin/lxqt-policykit-agent #notif daemon - +exec_always swhks & exec_always dunst & diff --git a/private_dot_config/sway/wayland b/private_dot_config/sway/wayland index b2a6796..3e129a4 100644 --- a/private_dot_config/sway/wayland +++ b/private_dot_config/sway/wayland @@ -3,7 +3,7 @@ bindsym $mod+Shift+e exec "swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit Sway?' -B 'Yes, exit Sway' 'swaymsg exit'" # TODO -bindsym $mod+space exec wofi --show drun +# bindsym $mod+space exec wofi --show drun # screenshots bindsym --release Print exec grimshot --notify copy diff --git a/private_dot_config/swhkd/executable_hotkeys.sh b/private_dot_config/swhkd/executable_hotkeys.sh index b919d60..105e935 100644 --- a/private_dot_config/swhkd/executable_hotkeys.sh +++ b/private_dot_config/swhkd/executable_hotkeys.sh @@ -2,5 +2,4 @@ killall swhks SWHKDRC="${XDG_CONFIG_HOME:-$HOME/.config}/swhkd/swhkdrc" -echo $SWHKDRC -swhks & pkexec swhkd -c $SWHKDRC +pkexec swhkd -d -c $SWHKDRC diff --git a/private_dot_config/swhkd/swhkdrc b/private_dot_config/swhkd/swhkdrc index a59d28a..43a20ce 100644 --- a/private_dot_config/swhkd/swhkdrc +++ b/private_dot_config/swhkd/swhkdrc @@ -2,12 +2,12 @@ super + b xdg-open http:// - # Pipewire controls XF86AudioRaiseVolume - pactl set-sink-volume 0 +5% #increase sound volume + pactl set-sink-volume "$(pactl list short sinks | cut -f 1 | head -n 1)" +5%;# increase sound volume XF86AudioLowerVolume - pactl set-sink-volume 0 -5% #decrease sound volume + pactl set-sink-volume "$(pactl list short sinks | cut -f 1 | head -n 1)" -5%; # decrease sound volume + XF86AudioMute pactl set-sink-mute 0 toggle # mute sound @@ -27,3 +27,23 @@ XF86MonBrightnessDown super + enter alacritty + +super + shift + e + rofi \ + -show p \ + -modi p:'rofi-power-menu --symbols-font "Symbols Nerd Font Mono"' \ + -theme lunar-witch + +super + space + rofi -combi-modi "drun#run" -show combi -show-icons -theme lunar-witch +super + tab + rofi -show window -show-icons -theme lunar-witch + +print + flameshot full -c -p "$XDG_PICTURES_DIR/screenshots/" + +shift + print + flameshot gui -s -c -p "$XDG_PICTURES_DIR/screenshots/" + +ctrl + print + flameshot gui -c -p "$XDG_PICTURES_DIR/screenshots/" diff --git a/private_dot_config/systemd/user/hotkeys.service b/private_dot_config/systemd/user/hotkeys.service index fc6e1a1..6eaff70 100644 --- a/private_dot_config/systemd/user/hotkeys.service +++ b/private_dot_config/systemd/user/hotkeys.service @@ -5,7 +5,6 @@ BindsTo=default.target [Service] Type=simple ExecStart=/home/mira/.config/swhkd/hotkeys.sh - [Install] WantedBy=default.target diff --git a/private_dot_config/user-dirs.locale b/private_dot_config/user-dirs.locale new file mode 100644 index 0000000..3e0b419 --- /dev/null +++ b/private_dot_config/user-dirs.locale @@ -0,0 +1 @@ +en_US \ No newline at end of file diff --git a/private_dot_config/wofi/config b/private_dot_config/wofi/config deleted file mode 100644 index b07dd30..0000000 --- a/private_dot_config/wofi/config +++ /dev/null @@ -1,5 +0,0 @@ -allow_images=true -matching=fuzzy -insensitive=true -image-size=16 -key_expand=Right diff --git a/private_dot_config/wofi/style.css b/private_dot_config/wofi/style.css deleted file mode 100644 index 2cdb31a..0000000 --- a/private_dot_config/wofi/style.css +++ /dev/null @@ -1,34 +0,0 @@ -@define-color black #1E1B30; -@define-color foreground #EBF6FF; -@define-color accent #0B5393; - - - -window, #input, #entry { - font-family: "Atkinson Hyperlegible"; - background: @black; - color: @foreground; -} - -#input { - padding-top: 0.5em; - padding-bottom: 0.25em; - padding-left: 1em; -} - -window, #input { - border-radius: 16px; -} - -#inner-box { - padding: 0.25em 1em; -} - -#text { - margin-left: 0.5em; -} - -#entry:selected{ - background: @accent; - border-radius: 4px; -} diff --git a/private_dot_config/xdg-desktop-portal/sway-portals.conf b/private_dot_config/xdg-desktop-portal/sway-portals.conf new file mode 100644 index 0000000..9372366 --- /dev/null +++ b/private_dot_config/xdg-desktop-portal/sway-portals.conf @@ -0,0 +1,6 @@ +[preferred] +# use xdg-desktop-portal-gtk for every portal interface +default=wlr;gtk +# except for the xdg-desktop-portal-wlr supplied interfaces +org.freedesktop.impl.portal.Screencast=wlr +org.freedesktop.impl.portal.Screenshot=wlr