From e58fd2b158686e7911f68dafa1dc1d71f789c4a4 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 25 Sep 2024 14:50:17 -0500 Subject: Remove swaylock from hypridle and stop hyprlock fades Before, hypridle would launch swaylock before sleeping, but hyprlock when receiving the loginctl lock-session command. This has been fixed. In addition, hyprlock no longer fades. --- hypr/hypridle.conf | 2 +- hypr/hyprlock.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf index 9b6ea02..39ed177 100644 --- a/hypr/hypridle.conf +++ b/hypr/hypridle.conf @@ -1,7 +1,7 @@ general { lock_cmd = hyprlock # dbus/sysd lock command (loginctl lock-session) unlock_cmd = # same as above, but unlock - before_sleep_cmd = swaylock # command ran before sleep + before_sleep_cmd = hyprlock # command ran before sleep after_sleep_cmd = # command ran after sleep ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam) } diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 84d08ae..24208d6 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -2,8 +2,8 @@ general { disable_loading_bar = false hide_cursor = false grace = 0 - no_fade_in = false - no_fade_out = false + no_fade_in = true + no_fade_out = true ignore_empty_input = false } -- cgit v1.2.3 From 98c3c50c85ea56eff874e20ded11f22eaa2fa401 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 25 Sep 2024 14:51:14 -0500 Subject: Remove deprecated hyprland windowrules The Hyprland rules windowdance and forceinput seem to have been deprecated, and now cause an error in the newest version of Hyprland, so this removes those lines. --- hypr/hyprland.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 652d4e1..2eac30c 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -182,9 +182,6 @@ plugin { # Example windowrule v2 # windowrulev2 = float, class:^(kitty)$, title:^(kitty)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -windowrule = windowdance, ^(oneshot)$ -windowrule = windowdance, title:^(UNDERTALE)$ -windowrule = windowdance, title:^(Rhythm Doctor)$ windowrule = fullscreen, ^(Xephyr)$ windowrule = float, title:^(LibreWolf - Choose User Profile)$ windowrule = float, ^(xdg-desktop-portal-gtk) @@ -197,8 +194,6 @@ windowrulev2 = stayfocused, title:^(menu)$,class:^(yabridge-host.exe.so)$ windowrulev2 = minsize 1 1, title:^(menu)$,class:^(yabridge-host.exe.so)$ windowrulev2 = float, class:^(yabridge-host.exe.so)$, title:^(menu)$ windowrulev2 = float, floating:0, title:^(menu*) -windowrulev2 = forceinput, title:^(menu*) -windowrulev2 = windowdance, title:^(menu*) windowrule = workspace 2, title:^(REAPER .*initializing.*)$ windowrulev2 = tile, class:^(REAPER)$, title:^(.*REAPER v[0-9.]* - Licensed for personal/small business use)$ windowrule = tile, ^(WebApp-Qobuz[0-9]*)$ -- cgit v1.2.3 From 145327e622abb7c2000bc65f17c0ef741c061358 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 25 Sep 2024 14:52:45 -0500 Subject: Set persistent workspaces on eDP-1 in waybar This was already being done on HDMI-A-1 and eDP-1, so now this is also done for eDP-1 to make it a little more cross-platform friendly. --- waybar/config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/waybar/config b/waybar/config index e2dcc50..7a54e0c 100644 --- a/waybar/config +++ b/waybar/config @@ -40,8 +40,7 @@ "18": "9", }, "persistent-workspaces": { - "DP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], - "HDMI-A-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], + "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], }, "on-scroll-up": "hyprctl dispatch split-workspace e+1", "on-scroll-down": "hyprctl dispatch split-workspace e-1", -- cgit v1.2.3 From 3489c08e374d6cde5c0268ccb356a6907f9a0d1a Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 25 Sep 2024 15:02:14 -0500 Subject: Ignore more directories --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 5bbe4db..f22368b 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,7 @@ glib-2.0/ gnome-control-center/ gnome-initial-setup-done gnome-session/ +go/ goa-1.0/ godot/ gomuks/ @@ -108,6 +109,7 @@ Kitware/ kritadisplayrc kritarc ksh/history +kwalletrc lab/ lbry/ LBRY/ @@ -210,6 +212,7 @@ remmina/ Resonant DSP/ retroarch/ rncbc.org/ +.rt64/ rtorrent/ runit/sv/*/supervise runit/sv/*/*/supervise -- cgit v1.2.3 From 4adc7a808f10ec4133bf16fbceea49ec6ed1560a Mon Sep 17 00:00:00 2001 From: ZachIR Date: Thu, 31 Oct 2024 12:05:06 -0500 Subject: Add suspend timeout to hypridle --- hypr/hypridle.conf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf index 39ed177..df2b123 100644 --- a/hypr/hypridle.conf +++ b/hypr/hypridle.conf @@ -7,7 +7,13 @@ general { } listener { - timeout = 600 # in seconds + timeout = 300 # in seconds on-timeout = loginctl lock-session # command to run when timeout has passed on-resume = # command to run when activity is detected after timeout has fired. } + +listener { + timeout = 360 # in seconds + on-timeout = systemctl suspend # command to run when timeout has passed + on-resume = # command to run when activity is detected after timeout has fired. +} -- cgit v1.2.3 From 5c939654efcbf64c57812d9e670f6f6566ae8be0 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Thu, 31 Oct 2024 12:05:37 -0500 Subject: Change hypridle, dunst, mpd hypr autostart to sysd I have accepted the systemd suck, so these are now mpd user services (although dunst and hypridle still have to be started by Hyprland). --- hypr/hyprland.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 2eac30c..9f1d55f 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -14,7 +14,7 @@ monitor = DP-1, 1920x1080@60, 1920x0, 1 exec-once = xdph exec-once = hyprpm reload -n exec-once = hyprpaper -exec-once = hypridle +#exec-once = hypridle exec-once = waybar exec-once = pypr exec-once = lxqt-policykit-agent @@ -23,7 +23,9 @@ exec-once = import-gsettings icon-theme 'Mint-X-Grey' exec-once = import-gsettings cursor-theme 'Breeze' exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources exec-once = com.github.wwmm.easyeffects -exec-once = mpd +exec-once = systemctl --user start dunst +exec-once = systemctl --user start hypridle +#exec-once = mpd #}}} #{{{ env -- cgit v1.2.3 From 76b662c7b576f5af9294a1dbdc8b94b35a1059ab Mon Sep 17 00:00:00 2001 From: ZachIR Date: Thu, 31 Oct 2024 12:07:14 -0500 Subject: Float kdenlive popup in Hyprland --- hypr/hyprland.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 9f1d55f..40b1ade 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -190,6 +190,7 @@ windowrule = float, ^(xdg-desktop-portal-gtk) windowrule = float, title:^(UNDERTALE)$ windowrule = float, ^(Tk)$ windowrule = float, ^(lxqt-policykit-agent)$ +windowrule = float, ^(Kdenlive)$ windowrulev2 = stayfocused, title:^()$, class:^(steam)$ windowrulev2 = minsize 1 1, title:^()$, class:^(steam)$ windowrulev2 = stayfocused, title:^(menu)$,class:^(yabridge-host.exe.so)$ -- cgit v1.2.3 From c2595192b158918d570f87dec01c697b7db90d2f Mon Sep 17 00:00:00 2001 From: ZachIR Date: Thu, 31 Oct 2024 12:07:52 -0500 Subject: Add acpi-notify script shortcut to hypr --- hypr/hyprland.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 40b1ade..7b2d664 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -346,6 +346,7 @@ bind = $mainMod, Q, exec, loginctl lock-session bind = $mainMod $secdMod CONTROL, Q, exec, systemctl suspend bind = $mainMod SHIFT, G, exec, get-app-id bind = $mainMod Control, M, exec, volsv -m +bind = $mainMod, Comma, exec, acpi-notify.sh #bind = $mainMod CONTROL, R, exec, startx -- /usr/bin/Xephyr -screen 1920x1080 :1 #}}} -- cgit v1.2.3 From f627c6a471c89f3a13ef0dfee411dc6dbf18a0ee Mon Sep 17 00:00:00 2001 From: ZachIR Date: Thu, 31 Oct 2024 12:08:12 -0500 Subject: Add auto-cpufreq zsh completion --- zsh/.zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/zsh/.zshrc b/zsh/.zshrc index 00be912..a00f116 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -97,3 +97,4 @@ bindkey -- '^[[B' down-line-or-beg [[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}" reverse-menu-complete [[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}" delete-char +eval "$(_AUTO_CPUFREQ_COMPLETE=zsh_source auto-cpufreq)" -- cgit v1.2.3 From 1aeb6934e5cd1babd19a56417d35b6fa1904f934 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Tue, 19 Nov 2024 12:43:33 -0600 Subject: Updates hypridle based on upstream The example config file works better than mine did, so I yoinked a bunch of stuff from it. --- hypr/hypridle.conf | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf index df2b123..f25f081 100644 --- a/hypr/hypridle.conf +++ b/hypr/hypridle.conf @@ -1,19 +1,34 @@ general { - lock_cmd = hyprlock # dbus/sysd lock command (loginctl lock-session) - unlock_cmd = # same as above, but unlock - before_sleep_cmd = hyprlock # command ran before sleep - after_sleep_cmd = # command ran after sleep - ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam) + lock_cmd = pidof hyprlock || hyprlock # avoid starting multiple hyprlock instances. + before_sleep_cmd = loginctl lock-session # lock before suspend. + after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display. } listener { - timeout = 300 # in seconds - on-timeout = loginctl lock-session # command to run when timeout has passed - on-resume = # command to run when activity is detected after timeout has fired. + timeout = 150 # 2.5min. + on-timeout = brightnessctl -s set 10 # set monitor backlight to minimum, avoid 0 on OLED monitor. + on-resume = brightnessctl -r # monitor backlight restore. } +# turn off keyboard backlight, comment out this section if you dont have a keyboard backlight. listener { - timeout = 360 # in seconds - on-timeout = systemctl suspend # command to run when timeout has passed - on-resume = # command to run when activity is detected after timeout has fired. + timeout = 150 # 2.5min. + on-timeout = brightnessctl -sd led::kbd_backlight set 0 # turn off keyboard backlight. + on-resume = brightnessctl -rd led::kbd_backlight # turn on keyboard backlight. +} + +listener { + timeout = 300 # 5min + on-timeout = loginctl lock-session # lock screen when timeout has passed +} + +listener { + timeout = 330 # 5.5min + on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed + on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired. +} + +listener { + timeout = 1800 # 30min + on-timeout = systemctl suspend # suspend pc } -- cgit v1.2.3 From 01432500285b3f0440edddbd3020524f02647701 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Tue, 19 Nov 2024 12:45:02 -0600 Subject: Updates hyprland config to the latest version Shadow became its own category in Decorations, and an option in master disappeared, and a new one got added. --- hypr/hyprland.conf | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 7b2d664..097aa8a 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -110,10 +110,6 @@ misc { decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more rounding = 10 - drop_shadow = no - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) #{{{ Blur options blur { enabled = true @@ -123,6 +119,14 @@ decoration { xray = true } #}}} + #{{{ Shadow options + shadow { + enabled = false + range = 4 + render_power = 3 + color = 0xee1a1a1a + } + #}}} } #}}} @@ -157,9 +161,10 @@ master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more new_status = inherit new_on_top = true - no_gaps_when_only = false + #no_gaps_when_only = false orientation = left inherit_fullscreen = true + drop_at_cursor = true } #}}} -- cgit v1.2.3 From bc4303e0ff999fec14463f9405a7fc7add325477 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Tue, 19 Nov 2024 12:46:49 -0600 Subject: Modify hyprlock behavior Hide cursor and loading bar, and ignore empty input. --- hypr/hyprlock.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 24208d6..57f9fdd 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -1,10 +1,10 @@ general { - disable_loading_bar = false - hide_cursor = false + disable_loading_bar = true + hide_cursor = true grace = 0 no_fade_in = true no_fade_out = true - ignore_empty_input = false + ignore_empty_input = true } background { -- cgit v1.2.3 From 6f57f517e48b6b09ef190c241579cec002cfde3f Mon Sep 17 00:00:00 2001 From: ZachIR Date: Tue, 19 Nov 2024 12:47:56 -0600 Subject: Fix chmod issue with spaces in lf Chmod would not apply properly to files or folders with spaces in the path; this has been fixed now. --- lf/lfrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lf/lfrc b/lf/lfrc index 702fc2d..19c6051 100644 --- a/lf/lfrc +++ b/lf/lfrc @@ -51,9 +51,9 @@ cmd chmod ${{ printf "Mode Bits: " read ans - for file in "$fx" + echo "$fx" | while read file do - chmod $ans $file + chmod "$ans" "$file" done }} -- cgit v1.2.3 From 2b9df77bbc5fa85f94b15b043c659168a606d1db Mon Sep 17 00:00:00 2001 From: ZachIR Date: Tue, 19 Nov 2024 12:49:46 -0600 Subject: Define xdg-desktop-portal defaults Use Hyprland for default, and use lxqt file chooser. --- xdg-desktop-portal/portals.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 xdg-desktop-portal/portals.conf diff --git a/xdg-desktop-portal/portals.conf b/xdg-desktop-portal/portals.conf new file mode 100644 index 0000000..faadd46 --- /dev/null +++ b/xdg-desktop-portal/portals.conf @@ -0,0 +1,3 @@ +[preferred] +default=hyprland +org.freedesktop.impl.portal.FileChooser=lxqt -- cgit v1.2.3 From 44fbfc95f779e5d6bbdaaf250ada4dfcdae5cb2a Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 18 Jan 2025 23:39:25 -0600 Subject: Cleanup zsh configs + add zplug Just a couple plugins for syntax highlighting and history searching, removing a bunch of old unused files, and changing to just accept the standard of using dotfiles in the home directory. --- Makefile | 16 +++++--- installers/set_zshdirs.sh | 13 ------ sh/profile | 2 +- zsh/.zlogout | 1 - zsh/.zprofile | 6 --- zsh/.zshenv | 5 --- zsh/.zshrc | 100 ---------------------------------------------- zsh/zshenv | 6 +++ zsh/zshrc | 72 +++++++++++++++++++++++++++++++++ 9 files changed, 90 insertions(+), 131 deletions(-) delete mode 100755 installers/set_zshdirs.sh delete mode 100644 zsh/.zlogout delete mode 100644 zsh/.zprofile delete mode 100644 zsh/.zshenv delete mode 100644 zsh/.zshrc create mode 100644 zsh/zshenv create mode 100644 zsh/zshrc diff --git a/Makefile b/Makefile index e27af0a..898fe9e 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,26 @@ VIM := $(shell command -v vim 2>/dev/null) NVIM := $(shell command -v nvim 2>/dev/null) -ZCONFS := zsh/.zshenv +ZCONFS := zsh/zshenv zsh/zshrc +SCONFS := sh/profile DCONFS := doas.conf all: -install: install-zshconfigs vimplug-vim vimplug-nvim +install: install-zshconfigs install-shconfigs vimplug-vim vimplug-nvim install-zshconfigs: $(ZCONFS) @echo "Installing zsh conf files..." - @echo "Setting ZSHDOTDIR globally..." - @$(shell sudo installers/set_zshdirs.sh) @echo ".zshenv..." - @ln -sf `pwd`/zsh/.zshenv ~/.zshenv + @ln -sf `pwd`/zsh/zshenv ~/.zshenv + @echo ".zshrc..." + @ln -sf `pwd`/zsh/zshrc ~/.zshrc @echo "Done." +install-shconfigs: $(SCONFS) + @echo "Installing sh conf files..." + @echo ".profile..." + @ln -sf `pwd`/sh/profile ~/.profile + vimplug-vim: installers/vimplug_vim.sh ifdef VIM @echo "Installing vim-plug for vim..." diff --git a/installers/set_zshdirs.sh b/installers/set_zshdirs.sh deleted file mode 100755 index 2d82f19..0000000 --- a/installers/set_zshdirs.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [ -f /etc/zshenv ]; then - ZSHENV="/etc/zshenv" -elif [ -d /etc/zsh ]; then - ZSHENV="/etc/zsh/zshenv" -else - ZSHENV="/etc/zshenv" -fi - -if ! grep -q "ZDOTDIR" $ZSHENV 2>/dev/null; then - echo "export ZDOTDIR=\"\$HOME\"/.config/zsh" >> $ZSHENV -fi diff --git a/sh/profile b/sh/profile index de79a65..b83d012 100644 --- a/sh/profile +++ b/sh/profile @@ -36,7 +36,7 @@ export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages export RXVT_SOCKET="$XDG_RUNTIME_DIR"/urxvtd export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc -export ZDOTDIR=$HOME/.config/zsh +#export ZDOTDIR=$HOME/.config/zsh export CARGO_HOME="$XDG_DATA_HOME"/cargo export RUSTUP_HOME="$XDG_DATA_HOME"/rustup export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat diff --git a/zsh/.zlogout b/zsh/.zlogout deleted file mode 100644 index 33666be..0000000 --- a/zsh/.zlogout +++ /dev/null @@ -1 +0,0 @@ -rm -rf /tmp/xorg-awake diff --git a/zsh/.zprofile b/zsh/.zprofile deleted file mode 100644 index 1eae5e7..0000000 --- a/zsh/.zprofile +++ /dev/null @@ -1,6 +0,0 @@ -#export GDK_DPI_SCALE=0.7 - -#gnome_schema=org.gnome.desktop.interface -# -#gsettings set $gnome_schema gtk-theme 'Plata-Noir-Compact' -#gsettings set $gnome_schema icon-theme 'Papirus-Dark' diff --git a/zsh/.zshenv b/zsh/.zshenv deleted file mode 100644 index f02f83a..0000000 --- a/zsh/.zshenv +++ /dev/null @@ -1,5 +0,0 @@ -# ZSH SPECIFIC CONFIGS -unset HISTFILE -export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" -[ -f /etc/profile ] && . /etc/profile -[ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile" diff --git a/zsh/.zshrc b/zsh/.zshrc deleted file mode 100644 index a00f116..0000000 --- a/zsh/.zshrc +++ /dev/null @@ -1,100 +0,0 @@ -HISTFILE="$ZDOTDIR"/hist -SAVEHIST=1000 -HISTSIZE=1000 -setopt APPEND_HISTORY -setopt HIST_FIND_NO_DUPS -setopt HIST_EXPIRE_DUPS_FIRST -setopt HIST_VERIFY -setopt HIST_IGNORE_DUPS -setopt INC_APPEND_HISTORY -setopt HIST_REDUCE_BLANKS - -_SH="zsh" - -if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then - source "$XDG_CONFIG_HOME"/sh/aliases -fi -if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then - source "$XDG_CONFIG_HOME"/sh/functions -fi - -if [ -n "$ZDOTDIR"/.zshrc -a -f "$ZDOTDIR"/.zshrc ]; then - alias e='source "$ZDOTDIR"/.zshrc' -elif [ -f "$HOME"/.zshrc ]; then - alias e='source ~/.zshrc' -fi - -bindkey "^?" backward-delete-char - -# bindkey -v - -if [ "$TERM" = "st-256color" ] || [ "$TERM" = "xterm-256color" ]; then - function zle-line-init () { echoti smkx } - function zle-line-finish () { echoti rmkx } - - zle -N zle-line-init - zle -N zle-line-finish -fi - -unset COLOR1 -ZSHTHEMERC="${ZDOTDIR:-$HOME}/.zsh_theme" -[ -f "$ZSHTHEMERC" ] && . "$ZSHTHEMERC" - -if [ -z "$COLOR1" ]; then - case "$(whoami)" in - zachir) COLOR1="014" ;; - git) COLOR1="013" ;; - subsonic) COLOR1="012" ;; - *) COLOR1="015" ;; - esac -fi - -MYPROMPT='%B%S%F{'"$COLOR1"'}[%n@%m]:%f%s%F{015}%~%f%S%F{'"$COLOR1"'}%#%f%s%b ' -function zle-line-init zle-keymap-select { - VIM_PROMPT="%B%F{012}[%n@%m]:%f%F{015}%~%f%F{012}%#%f%b " - PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}" - #PS1="$PROMPT $KEYMAP" - zle reset-prompt -} - -unset COLOR1 - -zle -N zle-line-init -zle -N zle-keymap-select -export KEYTIMEOUT=1 - -fpath+="$ZDOTDIR/zfunc" - -autoload -Uz compinit promptinit -compinit -d $CONFIG/zcompdump -promptinit -autoload -Uz up-line-or-beginning-search down-line-or-beginning-search -zle -N up-line-or-beginning-search -zle -N down-line-or-beginning-search - -zstyle ':completion:*' menu select -zstyle ':completion::complete:*' gain-privileges 1 -zstyle ':completion:*' rehash true - -setopt COMPLETE_ALIASES -setopt AUTO_CD - -typeset -g -A key - -key[Up]="${terminfo[kcuu1]}" -key[Down]="${terminfo[kcud1]}" -key[Left]="${terminfo[kcub1]}" -key[Right]="${terminfo[kcuf1]}" -key[Shift-Tab]="${terminfo[kcbt]}" -key[Delete]="${terminfo[kdch1]}" - -[[ -n "${key[Up]}" ]] && bindkey -- "${key[Up]}" up-line-or-beginning-search -bindkey -- '^[[A' up-line-or-beginning-search -bindkey -- '^[[B' down-line-or-beginning-search -[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-beginning-search -[[ -n "${key[Left]}" ]] && bindkey -- "${key[Left]}" backward-char -[[ -n "${key[Right]}" ]] && bindkey -- "${key[Right]}" forward-char -[[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}" reverse-menu-complete -[[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}" delete-char - -eval "$(_AUTO_CPUFREQ_COMPLETE=zsh_source auto-cpufreq)" diff --git a/zsh/zshenv b/zsh/zshenv new file mode 100644 index 0000000..df0371e --- /dev/null +++ b/zsh/zshenv @@ -0,0 +1,6 @@ +# ZSH SPECIFIC CONFIGS +unset HISTFILE +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +export skip_global_compinit=1 +[ -f /etc/profile ] && . /etc/profile +[ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile" diff --git a/zsh/zshrc b/zsh/zshrc new file mode 100644 index 0000000..fb5b167 --- /dev/null +++ b/zsh/zshrc @@ -0,0 +1,72 @@ +#zmodload zsh/zprof +if [ -d "$HOME/.zplug" ]; then + export ZPLUG_INSTALLED="y" + source "$HOME/.zplug/init.zsh" +fi +HISTFILE="$XDG_CONFIG_HOME/zsh/hist" +SAVEHIST=1000 +HISTSIZE=1000 +setopt APPEND_HISTORY +setopt HIST_FIND_NO_DUPS +setopt HIST_EXPIRE_DUPS_FIRST +setopt HIST_VERIFY +setopt HIST_IGNORE_DUPS +setopt INC_APPEND_HISTORY +setopt HIST_REDUCE_BLANKS +setopt COMPLETE_ALIASES +setopt AUTO_CD + +_SH="zsh" + +if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then + source "$XDG_CONFIG_HOME"/sh/aliases +fi +if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then + source "$XDG_CONFIG_HOME"/sh/functions +fi + +if [ -f "$XDG_CONFIG_HOME/zsh/zshrc" ]; then + alias e='source "$XDG_CONFIG_HOME/zsh/zshrc"' +elif [ -f "$XDG_CONFIG_HOME/zshrc" ]; then + alias e='source "$XDG_CONFIG_HOME/zshrc"' +elif [ -f "$HOME"/.zshrc ]; then + alias e='source ~/.zshrc' +fi + +bindkey -v + +MYPROMPT=$'%B%S%F{002}[%n@%m]%s\UE0B0%F{015}%~%S%F{002}\UE0B0%#%s\UE0B0%f%k%b ' +function zle-line-init zle-keymap-select { + VIM_PROMPT=$'%B%S%F{012}[%n@%m]%s\UE0B0%F{015}%~%S%F{012}\UE0B0%#%s\UE0B0%f%k%b ' + PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}" + zle reset-prompt +} + +zle -N zle-line-init +zle -N zle-keymap-select +export KEYTIMEOUT=1 + +fpath+="$XDG_CONFIG_HOME/zsh/zfunc" + +if [ -n "$ZPLUG_INSTALLED" ]; then + # zsh history substring search + zplug "zsh-users/zsh-history-substring-search", as:plugin + + bindkey '^[[A' history-substring-search-up + bindkey '^[[B' history-substring-search-down + bindkey -M vicmd '^[[A' history-substring-search-up + bindkey -M vicmd '^[[B' history-substring-search-down + bindkey -M vicmd 'k' history-substring-search-up + bindkey -M vicmd 'j' history-substring-search-down + + # zsh syntax highlighting + zplug "zsh-users/zsh-syntax-highlighting", defer:2 + + # load zsh plugins + zplug load +fi + +autoload -Uz compinit +compinit + +#zprof -- cgit v1.2.3 From 461c7af7ef31feb1db7e39762011ca0e54242d76 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 18 Jan 2025 23:41:09 -0600 Subject: Remove kitty close confirmation This confirmation would prompt even if only the shell was open; not anymore. --- kitty/kitty.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitty/kitty.conf b/kitty/kitty.conf index ceeaf72..540419a 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -879,7 +879,7 @@ resize_draw_strategy static #: insensitive, from the set [0-9A-Z]. Specify your preference as a #: string of characters. -# confirm_os_window_close -1 +confirm_os_window_close 0 #: Ask for confirmation when closing an OS window or a tab with at #: least this number of kitty windows in it by window manager (e.g. -- cgit v1.2.3 From 529347c99a6e43f2d24e5d9020ed76abd840da91 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 20 Jan 2025 01:55:34 -0600 Subject: Comment out vim latex preview autocmds This should be done manually, especially as every time you change to a different tab and change back causes another preview window to open. --- vim/vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 6b64279..cdf9b33 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -207,7 +207,7 @@ autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif " custom augroup {{{ augroup custom autocmd! - au BufEnter *.tex :LLPStartPreview + "au BufEnter *.tex :LLPStartPreview au BufEnter *.md :set textwidth=80 au BufEnter *.ms :set textwidth=80 "au BufEnter *.c :colo DevC++ @@ -217,7 +217,7 @@ augroup custom "au BufEnter *.cpp :colo DevC++ "au BufEnter *.hpp :colo DevC++ au BufWritePost init.vim :source % - au BufWritePost *.tex :make + "au BufWritePost *.tex :make au BufWritePost *sxhkdrc* :!pkill -USR1 -x sxhkd au BufWritePost .Xresources :!xrdb ~/.Xresources au BufWritePost .gitignore :!git add .gitignore -- cgit v1.2.3 From e12c367f1509eb570c78a19020fce02d769d5c49 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 20 Jan 2025 01:59:58 -0600 Subject: Don't swallow vim child windows in Hyprland Vim Latex Live Preview opens Zathura as my preview window, this should not swallow. --- hypr/hyprland.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 097aa8a..7b621e0 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -100,7 +100,7 @@ misc { disable_splash_rendering = true enable_swallow = true swallow_regex = ^(kitty)$ - swallow_exception_regex = ^(.*ueberzug)$ + swallow_exception_regex = ^(.*ueberzug|vim .*)$ vfr = true vrr = 1 } -- cgit v1.2.3 From b3272c366969eae34b4737e88f83332dd49e3297 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 20 Jan 2025 02:01:38 -0600 Subject: Comment out LLPreview in nvim It only works on Vim anyways. --- nvim/init.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index 42fe34d..d27d9d4 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -190,7 +190,7 @@ autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif " custom augroup {{{ augroup custom autocmd! - au BufEnter *.tex :LLPStartPreview + "au BufEnter *.tex :LLPStartPreview au BufEnter *.md :set textwidth=80 au BufEnter *.ms :set textwidth=80 "au BufEnter *.c :colo DevC++ @@ -200,7 +200,7 @@ augroup custom "au BufEnter *.cpp :colo DevC++ "au BufEnter *.hpp :colo DevC++ au BufWritePost init.vim :source % - au BufWritePost *.tex :make + "au BufWritePost *.tex :make au BufWritePost *sxhkdrc* :!pkill -USR1 -x sxhkd au BufWritePost .Xresources :!xrdb ~/.Xresources au BufWritePost .gitignore :!git add .gitignore -- cgit v1.2.3 From 9577f519444ae241a71a126f61dbe3a3ddcba0b8 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 20 Jan 2025 16:18:04 -0600 Subject: Extend hyprland no swallow regex to include nvim This should match either vim or nvim, as I figured out why LLP wasn't working in nvim for me. --- hypr/hyprland.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 7b621e0..c4b05c0 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -100,7 +100,7 @@ misc { disable_splash_rendering = true enable_swallow = true swallow_regex = ^(kitty)$ - swallow_exception_regex = ^(.*ueberzug|vim .*)$ + swallow_exception_regex = ^(.*ueberzug|n?vim .*)$ vfr = true vrr = 1 } -- cgit v1.2.3 From c1e2ed7f2bbef1879093c19ddd79787b3d671aff Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 20 Jan 2025 16:19:05 -0600 Subject: Set kitty tab-bar style to powerline I think it fits in better with my system than fade. --- kitty/kitty.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 540419a..55b72c8 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -913,7 +913,7 @@ confirm_os_window_close 0 #: The second number is the margin between the tab bar and the #: contents of the current tab. -# tab_bar_style fade +tab_bar_style powerline #: The tab bar style, can be one of: -- cgit v1.2.3 From 021b916382f129d8e95a5070fbbf466a05c2582a Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 20 Jan 2025 16:19:53 -0600 Subject: Use the same config for both vim and nvim This was already taken care of in the config, I'm not sure why I didn't do this at the time. --- nvim/init.vim | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nvim/init.vim b/nvim/init.vim index d27d9d4..cdf9b33 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,3 +1,20 @@ +set runtimepath^=$XDG_CONFIG_HOME/vim +set runtimepath+=$XDG_DATA_HOME/vim +set runtimepath+=$XDG_CONFIG_HOME/vim/after + +set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim +set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after + +let g:netrw_home = $XDG_DATA_HOME."/vim" +call mkdir($XDG_DATA_HOME."/vim/spell", 'p') + +set backupdir=$XDG_STATE_HOME/vim/backup | call mkdir(&backupdir, 'p') +set directory=$XDG_STATE_HOME/vim/swap | call mkdir(&directory, 'p') +set undodir=$XDG_STATE_HOME/vim/undo | call mkdir(&undodir, 'p') +set viewdir=$XDG_STATE_HOME/vim/view | call mkdir(&viewdir, 'p') + +if !has('nvim') | set viminfofile=$XDG_STATE_HOME/vim/viminfo | endif + " vimplugs {{{ call plug#begin('~/.config/nvim/plugged') " colorschemes {{{ -- cgit v1.2.3 From 8dd9c87d4d8c2f35f7ef26fe19d3330235abdfb7 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 20 Jan 2025 16:20:22 -0600 Subject: Use the Dark2 vim theme instead of 256-grayvim --- nvim/init.vim | 2 +- vim/vimrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index cdf9b33..812bf3e 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -62,7 +62,7 @@ set showmatch " Highlight matching brace set number set relativenumber -colorscheme 256-grayvim +colorscheme Dark2 set hlsearch " Highlight all search results set smartcase " Enable smart-case search diff --git a/vim/vimrc b/vim/vimrc index cdf9b33..812bf3e 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -62,7 +62,7 @@ set showmatch " Highlight matching brace set number set relativenumber -colorscheme 256-grayvim +colorscheme Dark2 set hlsearch " Highlight all search results set smartcase " Enable smart-case search -- cgit v1.2.3 From 95d509eeaba97aa0a35bb8c42225495e69d3a2c1 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Tue, 21 Jan 2025 19:11:45 -0600 Subject: Use zkbd for zsh keybindings --- zsh/zshrc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/zsh/zshrc b/zsh/zshrc index fb5b167..c95feb3 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -33,7 +33,16 @@ elif [ -f "$HOME"/.zshrc ]; then alias e='source ~/.zshrc' fi +source ~/.zkbd/$TERM-${${DISPLAY:t}:-$VENDOR-$OSTYPE} + +#autoload zkbd; zkbd bindkey -v +bindkey "${key[Backspace]}" backward-delete-char +bindkey "${key[Delete]}" delete-char +bindkey "${key[Home]}" beginning-of-line +bindkey "${key[End]}" end-of-line +bindkey "${key[PageUp]}" history-substring-search-up +bindkey "${key[PageDown]}" history-substring-search-down MYPROMPT=$'%B%S%F{002}[%n@%m]%s\UE0B0%F{015}%~%S%F{002}\UE0B0%#%s\UE0B0%f%k%b ' function zle-line-init zle-keymap-select { @@ -52,10 +61,10 @@ if [ -n "$ZPLUG_INSTALLED" ]; then # zsh history substring search zplug "zsh-users/zsh-history-substring-search", as:plugin - bindkey '^[[A' history-substring-search-up - bindkey '^[[B' history-substring-search-down - bindkey -M vicmd '^[[A' history-substring-search-up - bindkey -M vicmd '^[[B' history-substring-search-down + bindkey '${key[Up]}' history-substring-search-up + bindkey '${key[Down]}' history-substring-search-down + bindkey -M vicmd '${key[Up]}' history-substring-search-up + bindkey -M vicmd '${key[Down]}' history-substring-search-down bindkey -M vicmd 'k' history-substring-search-up bindkey -M vicmd 'j' history-substring-search-down -- cgit v1.2.3 From a9be74adf57403f7840d09f7a0081b6390864d5a Mon Sep 17 00:00:00 2001 From: ZachIR Date: Tue, 21 Jan 2025 19:12:56 -0600 Subject: Change zsh prompt to have <~> for powerline --- zsh/zshrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh/zshrc b/zsh/zshrc index c95feb3..0d6ecd5 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -44,9 +44,9 @@ bindkey "${key[End]}" end-of-line bindkey "${key[PageUp]}" history-substring-search-up bindkey "${key[PageDown]}" history-substring-search-down -MYPROMPT=$'%B%S%F{002}[%n@%m]%s\UE0B0%F{015}%~%S%F{002}\UE0B0%#%s\UE0B0%f%k%b ' +MYPROMPT=$'%B%S%F{002}[%n@%m]\UE0B2%F{015}%s%~%S%F{002}\UE0B0%#%s\UE0B0%f%k%b ' function zle-line-init zle-keymap-select { - VIM_PROMPT=$'%B%S%F{012}[%n@%m]%s\UE0B0%F{015}%~%S%F{012}\UE0B0%#%s\UE0B0%f%k%b ' + VIM_PROMPT=$'%B%S%F{012}[%n@%m]\UE0B2%F{015}%s%~%S%F{012}\UE0B0%#%s\UE0B0%f%k%b ' PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}" zle reset-prompt } -- cgit v1.2.3 From c654a8e82f10440551c2fec536c116000b7a6fe6 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Tue, 21 Jan 2025 19:14:14 -0600 Subject: Set gtk, icon, and mouse themes GTK Theme is now darkest/white, icon theme is COSMIC, and mouse theme is BreezeX-Black. --- gtk-2.0/gtkrc | 6 +++--- gtk-3.0/settings.ini | 6 +++--- hypr/hyprland.conf | 4 ++-- xsettingsd/xsettingsd.conf | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 6ae8019..6a23e8c 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -1,11 +1,11 @@ # DO NOT EDIT! This file will be overwritten by nwg-look. # Any customization should be done in ~/.gtkrc-2.0.mine instead. -gtk-theme-name="Flat-Remix-GTK-Green-Darkest-Solid" -gtk-icon-theme-name="Mint-X" +gtk-theme-name="Flat-Remix-GTK-White-Darkest-Solid" +gtk-icon-theme-name="Cosmic" gtk-font-name="Cantarell 11" gtk-cursor-theme-name="BreezeX-Black" -gtk-cursor-theme-size=24 +gtk-cursor-theme-size=32 gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=0 diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index 33306a4..f876bba 100644 --- a/gtk-3.0/settings.ini +++ b/gtk-3.0/settings.ini @@ -1,9 +1,9 @@ [Settings] -gtk-theme-name=Flat-Remix-GTK-Green-Darkest-Solid -gtk-icon-theme-name=Mint-X +gtk-theme-name=Flat-Remix-GTK-White-Darkest-Solid +gtk-icon-theme-name=Cosmic gtk-font-name=Cantarell 11 gtk-cursor-theme-name=BreezeX-Black -gtk-cursor-theme-size=24 +gtk-cursor-theme-size=32 gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=0 diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index c4b05c0..afef32a 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -20,7 +20,7 @@ exec-once = pypr exec-once = lxqt-policykit-agent exec-once = import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest-Solid' exec-once = import-gsettings icon-theme 'Mint-X-Grey' -exec-once = import-gsettings cursor-theme 'Breeze' +exec-once = import-gsettings cursor-theme 'BreezeX-Black' exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources exec-once = com.github.wwmm.easyeffects exec-once = systemctl --user start dunst @@ -30,7 +30,7 @@ exec-once = systemctl --user start hypridle #{{{ env # Environment variables set at launch -env = HYPRCURSOR_THEME,BreezeHypr +env = HYPRCURSOR_THEME,theme_BreezeX-Black env = HYPRCURSOR_SIZE,32 env = XCURSOR_THEME,BreezeX-Black env = XCURSOR_SIZE,32 diff --git a/xsettingsd/xsettingsd.conf b/xsettingsd/xsettingsd.conf index 27d09c3..c1e323c 100644 --- a/xsettingsd/xsettingsd.conf +++ b/xsettingsd/xsettingsd.conf @@ -1,5 +1,5 @@ -Net/ThemeName "Flat-Remix-GTK-Green-Darkest-Solid" -Net/IconThemeName "Mint-X" +Net/ThemeName "Flat-Remix-GTK-White-Darkest-Solid" +Net/IconThemeName "Cosmic" Gtk/CursorThemeName "BreezeX-Black" Net/EnableEventSounds 1 EnableInputFeedbackSounds 0 -- cgit v1.2.3 From b01aba07be1052b901f3bd4df5a4512e230805fe Mon Sep 17 00:00:00 2001 From: zachir Date: Tue, 21 Jan 2025 20:55:02 -0600 Subject: Fix F1 behavior on kitty It was previously mapped to something for some reason; it is no longer so. --- kitty/kitty.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 55b72c8..095607b 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1833,7 +1833,7 @@ map kitty_mod+g show_last_command_output #:: map f1 launch --stdin-source=@last_cmd_output --stdin-add-formatting --type=overlay less +G -R -map f1 launch --stdin-source=@last_cmd_output --type=background wl-copy +#:: map f1 launch --stdin-source=@last_cmd_output --type=background wl-copy #:: To get the output of the first command on the screen, use #:: @first_cmd_output_on_screen. To get the output of the last jumped -- cgit v1.2.3 From 695fcfe3d77d8ce3d07a609ded2f6deab5946433 Mon Sep 17 00:00:00 2001 From: zachir Date: Tue, 21 Jan 2025 20:55:47 -0600 Subject: Update .gitignore from cla --- .gitignore | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitignore b/.gitignore index f22368b..bb74ea4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +5DB5/ +5db5/ abook/ Applied Computer Music Technologies/ AHM 5050 v3/ @@ -7,6 +9,7 @@ Amp Locker/ Amp Locker.settings amsynth/ ardour*/ +audacity/ Audio Assault/ autostart/ Binance/ @@ -36,6 +39,7 @@ computerrc computerrc.sh configstore/ cordless/config.json +cosmic/ dconf/ dde-printer.ini DELTARUNE/ @@ -64,6 +68,7 @@ ghb/ GIMP/ git/ glib-2.0/ +glow/ gnome-control-center/ gnome-initial-setup-done gnome-session/ @@ -75,6 +80,7 @@ gtk-2.0/* !gtk-2.0/gtkrc gtk-3.0/* !gtk-3.0/settings.ini +gtk-4.0/ guitarix/ Hellbeast v2/ Hellbeast v2.settings @@ -124,6 +130,7 @@ lkjb/ lsp-plugins/ lutris/ lxqt/ +MangoHud/ menus/ mgba/ micro/buffers/ @@ -192,6 +199,7 @@ protonmail/ protonvpn/ pulse/ pupgui/ +qobuz-dl/ qrcp/ qt5ct/* !qt5ct/qt5ct.conf @@ -204,6 +212,7 @@ qutebrowser/jmatrix-rules r2modman/ r2modmanPlus-local/ raveloxmidi/ +razergenie/ rclone/ ReAmp Studio R1/ ReAmp Studio R1.settings @@ -225,11 +234,14 @@ Serenity/ Session/ Shibalba EXEX.settings sh/weather +SNAPSHOT PLAYER/ snownews/urls.opml solaar/ +sonobus/ spotifyd/ spotify-tui/ straw-viewer/ +strawberry/ subversion/ SUPERHOT/ suyu/ @@ -257,6 +269,7 @@ UNDERTALE*/ unity3d/ Valve Corporation/ vdirsyncer/ +vkBasalt/ VeraCrypt/ vim/* !vim/vimrc -- cgit v1.2.3 From dd88548e55fc05f2b9dff855143e87141690b42a Mon Sep 17 00:00:00 2001 From: ZachIR Date: Thu, 23 Jan 2025 14:17:04 -0600 Subject: Fix zsh search bindkeys They used single quotes, but needed to be double quotes. --- zsh/zshrc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zsh/zshrc b/zsh/zshrc index 0d6ecd5..4c633ee 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -61,12 +61,12 @@ if [ -n "$ZPLUG_INSTALLED" ]; then # zsh history substring search zplug "zsh-users/zsh-history-substring-search", as:plugin - bindkey '${key[Up]}' history-substring-search-up - bindkey '${key[Down]}' history-substring-search-down - bindkey -M vicmd '${key[Up]}' history-substring-search-up - bindkey -M vicmd '${key[Down]}' history-substring-search-down - bindkey -M vicmd 'k' history-substring-search-up - bindkey -M vicmd 'j' history-substring-search-down + bindkey "${key[Up]}" history-substring-search-up + bindkey "${key[Down]}" history-substring-search-down + bindkey -M vicmd "${key[Up]}" history-substring-search-up + bindkey -M vicmd "${key[Down]}" history-substring-search-down + bindkey -M vicmd "k" history-substring-search-up + bindkey -M vicmd "j" history-substring-search-down # zsh syntax highlighting zplug "zsh-users/zsh-syntax-highlighting", defer:2 -- cgit v1.2.3 From e3cde1579bbc9e07c0afc71084c9b5e83adf4ed7 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Thu, 23 Jan 2025 14:19:01 -0600 Subject: Un-bold the zsh prompt (fixes issue in some terms) Namely cool-retro-term doesn't like bolded powerline symbols. --- zsh/zshrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh/zshrc b/zsh/zshrc index 4c633ee..9acd42f 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -44,9 +44,9 @@ bindkey "${key[End]}" end-of-line bindkey "${key[PageUp]}" history-substring-search-up bindkey "${key[PageDown]}" history-substring-search-down -MYPROMPT=$'%B%S%F{002}[%n@%m]\UE0B2%F{015}%s%~%S%F{002}\UE0B0%#%s\UE0B0%f%k%b ' +MYPROMPT=$'%S%F{002}[%n@%m]\UE0B2%F{015}%s%~%S%F{002}\UE0B0%#%s\UE0B0%f ' function zle-line-init zle-keymap-select { - VIM_PROMPT=$'%B%S%F{012}[%n@%m]\UE0B2%F{015}%s%~%S%F{012}\UE0B0%#%s\UE0B0%f%k%b ' + VIM_PROMPT=$'%S%F{012}[%n@%m]\UE0B2%F{015}%s%~%S%F{012}\UE0B0%#%s\UE0B0%f ' PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}" zle reset-prompt } -- cgit v1.2.3 From 18450042569408f80694a252dd17b7d1d22ecbfb Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:29:23 -0600 Subject: Fix gtk and qt theming Also set the theme back to green instead of white --- gtk-2.0/gtkrc | 2 +- gtk-3.0/settings.ini | 18 ++---------------- qt5ct/qt5ct.conf | 14 +++++++------- qt6ct/qt6ct.conf | 8 ++++---- sh/profile | 2 +- xsettingsd/xsettingsd.conf | 2 +- 6 files changed, 16 insertions(+), 30 deletions(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 6a23e8c..3c97dc3 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -1,7 +1,7 @@ # DO NOT EDIT! This file will be overwritten by nwg-look. # Any customization should be done in ~/.gtkrc-2.0.mine instead. -gtk-theme-name="Flat-Remix-GTK-White-Darkest-Solid" +gtk-theme-name="Flat-Remix-GTK-Green-Darkest" gtk-icon-theme-name="Cosmic" gtk-font-name="Cantarell 11" gtk-cursor-theme-name="BreezeX-Black" diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index f876bba..87b4543 100644 --- a/gtk-3.0/settings.ini +++ b/gtk-3.0/settings.ini @@ -1,17 +1,3 @@ [Settings] -gtk-theme-name=Flat-Remix-GTK-White-Darkest-Solid -gtk-icon-theme-name=Cosmic -gtk-font-name=Cantarell 11 -gtk-cursor-theme-name=BreezeX-Black -gtk-cursor-theme-size=32 -gtk-toolbar-style=GTK_TOOLBAR_ICONS -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=0 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle=hintslight -gtk-xft-rgba=rgb -gtk-application-prefer-dark-theme=0 +gtk-cursor-theme-name = BreezeX-Black +gtk-cursor-theme-size = 32 diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf index 516eaab..964da53 100644 --- a/qt5ct/qt5ct.conf +++ b/qt5ct/qt5ct.conf @@ -1,13 +1,13 @@ [Appearance] -color_scheme_path=/usr/share/qt5ct/colors/darker.conf -custom_palette=false -icon_theme=Mint-X-Grey -standard_dialogs=xdgdesktopportal +color_scheme_path=/home/zachir/.config/qt5ct/style-colors.conf +custom_palette=true +icon_theme=Cosmic +standard_dialogs=gtk2 style=gtk2 [Fonts] -fixed=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) -general=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) +fixed="DejaVu LGC Sans,12,-1,5,50,0,0,0,0,0" +general="DejaVu LGC Sans,12,-1,5,50,0,0,0,0,0" [Interface] activate_item_on_single_click=1 @@ -25,7 +25,7 @@ underline_shortcut=1 wheel_scroll_lines=3 [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1\x95\0\0\0\xfb\0\0\x5\x45\0\0\x3\x93\0\0\x1\x96\0\0\0\xfc\0\0\x5\x44\0\0\x3\x92\0\0\0\0\0\0\0\0\a\x80\0\0\x1\x96\0\0\0\xfc\0\0\x5\x44\0\0\x3\x92) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0H\0\0\x2T\0\0\x3\xdb\0\0\x4/\0\0\0H\0\0\x2T\0\0\x3\xdb\0\0\x4/\0\0\0\0\0\0\0\0\a\x80\0\0\0H\0\0\x2T\0\0\x3\xdb\0\0\x4/) [Troubleshooting] force_raster_widgets=1 diff --git a/qt6ct/qt6ct.conf b/qt6ct/qt6ct.conf index 810fb94..5d9a12c 100644 --- a/qt6ct/qt6ct.conf +++ b/qt6ct/qt6ct.conf @@ -1,8 +1,8 @@ [Appearance] color_scheme_path=/usr/share/qt6ct/colors/airy.conf custom_palette=false -icon_theme=Mint-X -standard_dialogs=xdgdesktopportal +icon_theme=Cosmic +standard_dialogs=gtk2 style=qt6gtk2 [Fonts] @@ -12,7 +12,7 @@ general="DejaVu LGC Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" [Interface] activate_item_on_single_click=1 buttonbox_layout=0 -cursor_flash_time=1000 +cursor_flash_time=1200 dialog_buttons_have_icons=1 double_click_interval=400 gui_effects=@Invalid() @@ -25,7 +25,7 @@ underline_shortcut=1 wheel_scroll_lines=3 [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\x42\0\0\x3\xe7\0\0\0\0\0\0\0\0\0\0\x2\xde\0\0\x2\x46\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x3\x42\0\0\x3\xe7) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\xff\xff\xff\xfd\xff\xff\xff\xe2\0\0\a<\0\0\x3\xf9\0\0\0\0\0\0\0\0\0\0\a9\0\0\x3\xf6\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\a9\0\0\x3\xf6) [Troubleshooting] force_raster_widgets=1 diff --git a/sh/profile b/sh/profile index b83d012..55657fa 100644 --- a/sh/profile +++ b/sh/profile @@ -63,7 +63,7 @@ export GDK_SCALE=1 export GDK_DPI_SCALE=1 # Theming -export QT_QPA_PLATFORMTHEME=qt5ct +export QT_QPA_PLATFORMTHEME=qt6ct # Fix wayland stuff export MOZ_ENABLE_WAYLAND=1 diff --git a/xsettingsd/xsettingsd.conf b/xsettingsd/xsettingsd.conf index c1e323c..e762fa9 100644 --- a/xsettingsd/xsettingsd.conf +++ b/xsettingsd/xsettingsd.conf @@ -1,4 +1,4 @@ -Net/ThemeName "Flat-Remix-GTK-White-Darkest-Solid" +Net/ThemeName "Flat-Remix-GTK-Green-Darkest" Net/IconThemeName "Cosmic" Gtk/CursorThemeName "BreezeX-Black" Net/EnableEventSounds 1 -- cgit v1.2.3 From 5bfc5fde04608fe51beb3487756d110f95e92d43 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:31:04 -0600 Subject: Disable hyprland logs For now, at least. --- hypr/hyprland.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index afef32a..a8a0cb3 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -41,8 +41,8 @@ env = XCURSOR_SIZE,32 # Debug {{{ debug { - enable_stdout_logs = true - disable_logs = false + enable_stdout_logs = false + disable_logs = true } # }}} -- cgit v1.2.3 From fdf4bbf3a585c60a18df446361a24dae4c352d6e Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:32:07 -0600 Subject: Fix lf image preview (ctpv broke) --- lf/lfrc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lf/lfrc b/lf/lfrc index 19c6051..32c9a10 100644 --- a/lf/lfrc +++ b/lf/lfrc @@ -1,9 +1,8 @@ set ratios 1:2:3 -set cleaner ctpvclear -set previewer ctpv -&ctpv -s $id . -&ctpvquit $id +set previewer ~/.config/lf/previewer +set cleaner ~/.config/lf/cleaner # Basic Settings +set sixel true set preview true set drawbox false set icons true -- cgit v1.2.3 From 4338d5c6a527249bd5bbfe797cba9ff4d0ddd8ac Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:33:16 -0600 Subject: Add command_not_found handle for distrobox --- sh/profile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sh/profile b/sh/profile index 55657fa..ff237a1 100644 --- a/sh/profile +++ b/sh/profile @@ -130,3 +130,17 @@ addtopath "/var/lib/flatpak/exports/bin" unset -f addtopath unset USERPATH unset PATHS + +command_not_found_handle() { +# don't run if not in a container + if [ ! -e /run/.containerenv ] && [ ! -e /.dockerenv ]; then + exit 127 + fi + + distrobox-host-exec "${@}" +} +if [ -n "${ZSH_VERSION-}" ]; then + command_not_found_handler() { + command_not_found_handle "$@" + } +fi -- cgit v1.2.3 From 2b36d09d26eccaaee4d5d136c8837d405be7466f Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:34:14 -0600 Subject: Fix tofi colors --- tofi/themes/colors | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tofi/themes/colors b/tofi/themes/colors index a5f480c..047c875 100644 --- a/tofi/themes/colors +++ b/tofi/themes/colors @@ -1,10 +1,10 @@ background-color = #000000 -outline-color = #39c1ed -border-color = #39c1ed +outline-color = #198844 +border-color = #198844 text-color = #ffffff -prompt-color = #39c1ed +prompt-color = #198844 prompt-background = #000000 -placeholder-color = #39c1ed +placeholder-color = #198844 placeholder-background = #000000 input-color = #ffffff input-background = #000000 @@ -12,6 +12,6 @@ default-result-background = #000000 alternate-result-color = #ffffff alternate-result-background = #000000 selection-color = #000000 -selection-match-color = #198844 -selection-background = #39c1ed +selection-match-color = #39c1ed +selection-background = #198844 -- cgit v1.2.3 From 26b810065268e1ed77a2552ab50e99d53f558d23 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:34:45 -0600 Subject: Set default portal to gtk, add darkman --- xdg-desktop-portal/portals.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xdg-desktop-portal/portals.conf b/xdg-desktop-portal/portals.conf index faadd46..b1a274e 100644 --- a/xdg-desktop-portal/portals.conf +++ b/xdg-desktop-portal/portals.conf @@ -1,3 +1,4 @@ [preferred] default=hyprland -org.freedesktop.impl.portal.FileChooser=lxqt +org.freedesktop.impl.portal.FileChooser=gtk +org.freedesktop.impl.portal.Settings=darkman -- cgit v1.2.3 From 2b4b5745869068693f04a6645f7ed1c01a7b093a Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:35:19 -0600 Subject: Add darkman config file --- darkman/config.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 darkman/config.yaml diff --git a/darkman/config.yaml b/darkman/config.yaml new file mode 100644 index 0000000..5cf7ee4 --- /dev/null +++ b/darkman/config.yaml @@ -0,0 +1,3 @@ +usegeoclue: false +dbusserver: true +portal: true -- cgit v1.2.3 From 5f56eaf9d37a1f34c0e0ef27dbee20db644d6f0a Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:35:45 -0600 Subject: Add tofi configs for cosmic --- tofi/colors | 17 +++++++++++++++++ tofi/cosmic | 22 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 tofi/colors create mode 100644 tofi/cosmic diff --git a/tofi/colors b/tofi/colors new file mode 100644 index 0000000..a5f480c --- /dev/null +++ b/tofi/colors @@ -0,0 +1,17 @@ +background-color = #000000 +outline-color = #39c1ed +border-color = #39c1ed +text-color = #ffffff +prompt-color = #39c1ed +prompt-background = #000000 +placeholder-color = #39c1ed +placeholder-background = #000000 +input-color = #ffffff +input-background = #000000 +default-result-background = #000000 +alternate-result-color = #ffffff +alternate-result-background = #000000 +selection-color = #000000 +selection-match-color = #198844 +selection-background = #39c1ed + diff --git a/tofi/cosmic b/tofi/cosmic new file mode 100644 index 0000000..9a5b4be --- /dev/null +++ b/tofi/cosmic @@ -0,0 +1,22 @@ +include = "themes/colors" + +hidden-character = "*" +anchor = top +width = 100% +height = 32 +horizontal = true +font-size = 18 +prompt-text = "" +font = Fira Code Nerd Font Mono +outline-width = 0 +border-width = 0 +min-input-width = 424 +result-spacing = 15 +padding-top = 0 +padding-bottom = 0 +padding-left = 0 +padding-right = 0 +history = false +selection-background-padding = 12 +result-spacing = 24 +require-match=false -- cgit v1.2.3 From 048d640a5cfac9f2dc010bdf26790eb2dc30f67f Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:36:26 -0600 Subject: Set xcursor theme --- environment.d/cursor.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 environment.d/cursor.conf diff --git a/environment.d/cursor.conf b/environment.d/cursor.conf new file mode 100644 index 0000000..9b9ef2b --- /dev/null +++ b/environment.d/cursor.conf @@ -0,0 +1,2 @@ +XCURSOR_THEME=BreezeX-Black +XCURSOR_SIZE=32 -- cgit v1.2.3 From a4e6a837c6edc8f1c2ea8f714ce84f61a3629715 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:40:17 -0600 Subject: Add handlr config --- handlr/handlr.toml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 handlr/handlr.toml diff --git a/handlr/handlr.toml b/handlr/handlr.toml new file mode 100644 index 0000000..58e04ba --- /dev/null +++ b/handlr/handlr.toml @@ -0,0 +1,4 @@ +enable_selector = false +selector = "tofi -c ~/.conifg/tofi/cosmic --prompt-text 'Open With: '" +term_exec_args = '-e' +expand_wildcards = false -- cgit v1.2.3 From 5f057879086ec863dbcbadcb2cfdcc61a68a62ce Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:40:36 -0600 Subject: Add cleaner and preview to fix lf --- lf/cleaner | 2 ++ lf/previewer | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100755 lf/cleaner create mode 100755 lf/previewer diff --git a/lf/cleaner b/lf/cleaner new file mode 100755 index 0000000..af197ee --- /dev/null +++ b/lf/cleaner @@ -0,0 +1,2 @@ +#!/bin/sh +exec kitten icat --clear --stdin no --transfer-mode memory /dev/tty diff --git a/lf/previewer b/lf/previewer new file mode 100755 index 0000000..24db043 --- /dev/null +++ b/lf/previewer @@ -0,0 +1,36 @@ +#!/bin/sh +draw() { + kitten icat --stdin no --transfer-mode memory --place "${w}x${h}@${x}x${y}" "$1" /dev/tty + exit 1 +} + +file="$1" +w="$2" +h="$3" +x="$4" +y="$5" + +case "$(file -Lb --mime-type "$file")" in + image/*) + draw "$file" + ;; + video/*) + # vidthumb is from here: + # https://raw.githubusercontent.com/duganchen/kitty-pistol-previewer/main/vidthumb + draw "$(vidthumb "$file")" + ;; + application/pdf) + CACHE=$(mktemp /tmp/thumbcache.XXXXX) + pdftoppm -png -f 1 -singlefile "$1" "$CACHE" + draw "$CACHE.png" + rm -f "$CACHE" "$CACHE.png" + ;; + application/epub+zip|application/epub) + CACHE=$(mktemp /tmp/thumbcache.XXXXX) + epub-thumbnailer "$1" "$CACHE" 1024 + $HOME/.config/lf/image draw "$CACHE" + rm -f "$CACHE" "$CACHE.png" + ;; +esac + +pistol "$file" -- cgit v1.2.3 From b49362306bebbcd77517940203e981d263b31d0e Mon Sep 17 00:00:00 2001 From: ZachIR Date: Fri, 28 Feb 2025 11:40:54 -0600 Subject: Set rust text width to 80 --- nvim/after/ftplugin/rust.vim | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 nvim/after/ftplugin/rust.vim diff --git a/nvim/after/ftplugin/rust.vim b/nvim/after/ftplugin/rust.vim new file mode 100644 index 0000000..7a152a7 --- /dev/null +++ b/nvim/after/ftplugin/rust.vim @@ -0,0 +1,2 @@ +:set formatoptions+=t +:set textwidth=80 -- cgit v1.2.3 From 6f6aca5bbe65ac520da26bc241eda97333433e91 Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 28 Feb 2025 17:01:10 -0600 Subject: Fix GTK-3 settings --- gtk-3.0/settings.ini | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index 87b4543..85d3ba5 100644 --- a/gtk-3.0/settings.ini +++ b/gtk-3.0/settings.ini @@ -1,3 +1,17 @@ [Settings] -gtk-cursor-theme-name = BreezeX-Black -gtk-cursor-theme-size = 32 +gtk-theme-name=Flat-Remix-GTK-Green-Darkest +gtk-icon-theme-name=Cosmic +gtk-font-name=Cantarell 11 +gtk-cursor-theme-name=BreezeX-Black +gtk-cursor-theme-size=32 +gtk-toolbar-style=GTK_TOOLBAR_ICONS +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=0 +gtk-menu-images=0 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=0 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintslight +gtk-xft-rgba=rgb +gtk-application-prefer-dark-theme=0 -- cgit v1.2.3 From 5fb45814cbb6ab38adbff7c952339c1da3580731 Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 28 Feb 2025 17:01:33 -0600 Subject: Reconfigure yay --- yay/config.json | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/yay/config.json b/yay/config.json index 0e764be..2b64b70 100644 --- a/yay/config.json +++ b/yay/config.json @@ -1,7 +1,7 @@ { "aururl": "https://aur.archlinux.org", - "buildDir": "$HOME/.cache/yay", - "absdir": "$HOME/.cache/yay/abs", + "aurrpcurl": "https://aur.archlinux.org/rpc?", + "buildDir": "/home/zachir/.cache/yay", "editor": "nvim", "editorflags": "", "makepkgbin": "makepkg", @@ -9,8 +9,7 @@ "pacmanbin": "pacman", "pacmanconf": "/etc/pacman.conf", "redownload": "no", - "rebuild": "no", - "answerclean": "", + "answerclean": "All", "answerdiff": "", "answeredit": "", "answerupgrade": "", @@ -21,23 +20,31 @@ "sortby": "votes", "searchby": "name-desc", "gitflags": "", - "removemake": "ask", + "removemake": "yes", "sudobin": "sudo", "sudoflags": "", + "version": "12.4.2", "requestsplitn": 150, - "sortmode": 0, "completionrefreshtime": 7, - "sudoloop": false, + "maxconcurrentdownloads": 1, + "bottomup": true, + "sudoloop": true, "timeupdate": false, "devel": false, - "cleanAfter": false, + "cleanAfter": true, + "keepSrc": false, "provides": true, "pgpfetch": true, - "upgrademenu": true, "cleanmenu": true, - "diffmenu": true, + "diffmenu": false, "editmenu": true, "combinedupgrade": false, "useask": false, - "batchinstall": false + "batchinstall": false, + "singlelineresults": false, + "separatesources": true, + "debug": false, + "rpc": true, + "doubleconfirm": true, + "rebuild": "no" } -- cgit v1.2.3 From 12fb9ecc242867b03626d1c52e5e84799ab330c8 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 17 Apr 2025 22:59:36 -0500 Subject: Redo nvim to use init.lua --- nvim/init.lua | 5 + nvim/init.vim | 306 ----------------------------------------------- nvim/lua/colorscheme.lua | 8 ++ nvim/lua/keymaps.lua | 97 +++++++++++++++ nvim/lua/options.lua | 32 +++++ nvim/lua/plugins.lua | 106 ++++++++++++++++ nvim/lua/term.lua | 51 ++++++++ sh/profile | 2 +- vim/vimrc | 4 +- 9 files changed, 302 insertions(+), 309 deletions(-) create mode 100644 nvim/init.lua delete mode 100644 nvim/init.vim create mode 100644 nvim/lua/colorscheme.lua create mode 100644 nvim/lua/keymaps.lua create mode 100644 nvim/lua/options.lua create mode 100644 nvim/lua/plugins.lua create mode 100644 nvim/lua/term.lua diff --git a/nvim/init.lua b/nvim/init.lua new file mode 100644 index 0000000..cf11420 --- /dev/null +++ b/nvim/init.lua @@ -0,0 +1,5 @@ +require('options') +require('keymaps') +require('plugins') +require('colorscheme') +require('term') diff --git a/nvim/init.vim b/nvim/init.vim deleted file mode 100644 index 812bf3e..0000000 --- a/nvim/init.vim +++ /dev/null @@ -1,306 +0,0 @@ -set runtimepath^=$XDG_CONFIG_HOME/vim -set runtimepath+=$XDG_DATA_HOME/vim -set runtimepath+=$XDG_CONFIG_HOME/vim/after - -set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim -set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after - -let g:netrw_home = $XDG_DATA_HOME."/vim" -call mkdir($XDG_DATA_HOME."/vim/spell", 'p') - -set backupdir=$XDG_STATE_HOME/vim/backup | call mkdir(&backupdir, 'p') -set directory=$XDG_STATE_HOME/vim/swap | call mkdir(&directory, 'p') -set undodir=$XDG_STATE_HOME/vim/undo | call mkdir(&undodir, 'p') -set viewdir=$XDG_STATE_HOME/vim/view | call mkdir(&viewdir, 'p') - -if !has('nvim') | set viminfofile=$XDG_STATE_HOME/vim/viminfo | endif - -" vimplugs {{{ -call plug#begin('~/.config/nvim/plugged') -" colorschemes {{{ -Plug 'tomasiser/vim-code-dark' " codedark color scheme -Plug 'flazz/vim-colorschemes' " meta-color scheme package -Plug 'tomasiser/vim-code-dark' " codedark color scheme -Plug 'flazz/vim-colorschemes' " meta-color scheme package -Plug 'ZachIndigo/vim-preglow' " my old color scheme -" }}} -" language support {{{ -Plug 'axvr/org.vim' " basic org markup language implementation -Plug 'ziglang/zig.vim' " zig programming language -Plug 'jdonaldson/vaxe' " haxe programming language -Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' } " latex live preview support -Plug 'waycrate/swhkd-vim' " swhkd syntax highlighting -Plug 'HiPhish/guile.vim' " guile syntax highlighting -" }}} -" utility {{{ -Plug 'preservim/nerdtree' " directory tree interface -Plug 'Xuyuanp/nerdtree-git-plugin' " git status indicator for nerdtree -Plug 'PhilRunninger/nerdtree-visual-selection' " allows visual selection mode in nerdtree -Plug 'tpope/vim-fugitive' " git command interface -Plug 'junegunn/goyo.vim' " simplify the user interface (distraction-free) [BROKEN] -Plug 'junegunn/limelight.vim' " focus on single paragraph of text at a time -Plug 'vim-airline/vim-airline' " powerline the vim bottom bar -Plug 'nathanaelkane/vim-indent-guides' " indent guides for vim -Plug 'mhinz/vim-signify' " use signs to show diffs -Plug 'tpope/vim-endwise' " auto end functions/if statements -Plug 'tpope/vim-surround' " auto close stuff -Plug 'mattn/emmet-vim' " html css easy formating -Plug 'godlygeek/tabular' " Needed for vim-markdown -Plug 'plasticboy/vim-markdown' " Better markdown support -Plug 'ryanoasis/vim-devicons' " dev icons for nerdtree -" }}} -call plug#end() - -" }}} -" nvim options {{{ - -"" nvimrc: -"" General - -set showmatch " Highlight matching brace - -set number -set relativenumber - -colorscheme Dark2 - -set hlsearch " Highlight all search results -set smartcase " Enable smart-case search -set incsearch " Searches for strings incrementally - -set expandtab " Use spaces instead of tabs -set shiftwidth=2 " Number of auto-indent spaces -set smartindent " Enable smart-indent -set smarttab " Enable smart-tabs -set softtabstop=2 " Number of spaces per Tab - -"" Advanced -set ruler " Show row and column ruler information -set undolevels=1000 " Number of undo levels -set backspace=indent,eol,start " Backspace behaviour -filetype plugin indent on - -"" GUI Config -set guifont=mononoki\ Nerd\ Font\ Mono:h12 - -"hi Normal guibg=NONE ctermbg=NONE -"hi NonText guibg=NONE ctermbg=NONE -"set background=dark - -set foldmethod=marker - -set conceallevel=2 - -" set leader key - -let mapleader="'" - -" emmet {{{ -let g:user_emmet_leader_key='' -" }}} - -" zig config {{{ -let g:zig_fmt_autosave = 1 -" }}} - -" latex live preview {{{ -let g:livepreview_previewer = 'zathura' -let g:livepreview_use_biber = 1 -let g:livepreview_cursorhold_recompile = 0 -" }}} - -" vim-markdown {{{ -let g:vim_markdown_folding_disabled = 1 -let g:vim_markdown_folding_level = 3 -let g:vim_markdown_toc_autofit = 1 -let g:vim_markdown_emphasis_multiline = 0 -let g:tex_conceal = "" -let g:vim_markdown_math = 1 -let g:vim_markdown_conceal_code_blocks = 1 -let g:vim_markdown_fenced_languages = ['c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini'] -let g:vim_markdown_follow_anchor = 1 -let g:vim_markdown_math = 1 -let g:vim_markdown_frontmatter = 1 -let g:vim_markdown_toml_frontmatter = 1 -let g:vim_markdown_strikethrough = 1 -let g:vim_markdown_no_extensions_in_markdown = 1 -let g:vim_markdown_autowrite = 1 -let g:vim_markdown_auto_insert_bullets = 0 -let g:vim_markdown_new_list_item_indent = 0 -let g:vim_markdown_edit_url_in = 'tab' -" }}} - -" NERDTree config {{{ -let g:NERDTreeGitStatusUseNerdFonts = 1 " use nerd fonts -let g:NERDTreeGitStatusShowClean = 1 " default: 0 -let g:NERDTreeDirArrowExpandable = '>' -let g:NERDTreeDirArrowCollapsible = '<' -let g:NERDTreeMapToggleHidden = 'z' -" }}} - -" Goyo config {{{ -let g:goyo_width = '90%' -let g:goyo_height = '100%' -" }}} - -" limelight config {{{ -let g:limelight_conceal_ctermfg = 'gray' -let g:limelight_conceal_guifg = 'gray' -" }}} - -" devicon config {{{ -let g:airline_powerline_fonts = 1 -let g:webdevicons_enable_nerdtree = 1 -" }}} - -" vim-indent-guides config {{{ -let g:indent_guides_enable_on_vim_startup = 0 -" }}} - -" vim-signify config {{{ -set updatetime=100 -" }}} - -" }}} -" Functions {{{ -" Goyo functions {{{ -function! s:goyo_enter() - if executable('tmux') && strlen($TMUX) - silent !tmux set status off - silent !tmux list-panes -F '\#F' | grep -q Z || tmux resize-pane -Z - endif - set noshowmode - set noshowcmd - set scrolloff=999 - Limelight - NERDTreeClose -endfunction -function! s:goyo_leave() - if executable('tmux') && strlen('$TMUX') - silent !tmux set status on - silent !tmux list-panes -F '\#F' | grep -q Z && tmux resize-pane -Z - endif - set showmode - set showcmd - set scrolloff=5 - Limelight! - NERDTree -endfunction -" }}} -" }}} -" Autocommands {{{ -" Goyo autocommands {{{ -autocmd! User GoyoEnter nested call goyo_enter() -autocmd! User GoyoLeave nested call goyo_leave() -" }}} -" NERDTree autocmds {{{ -autocmd StdinReadPre * let s:std_in=1 -autocmd VimEnter * if argc() == 0 && !exists('s:std_in') | NERDTree | wincmd p | endif -autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists('s:std_in') | - \ execute 'NERDTree' argv()[0] | wincmd p | enew | execute 'cd '.argv()[0] | endif -autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif -autocmd BufEnter * if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif -"autocmd BufEnter * if bufname('#') =~ 'NERD_tree_\d\+' && bufname('%') !~ 'NERD_tree_\d\+' && winnr('$') > 1 | - "\ let buf=bufnr() | buffer# | execute "normal! \w" | execute 'buffer;.buf | endif -autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif -" }}} -" custom augroup {{{ -augroup custom - autocmd! - "au BufEnter *.tex :LLPStartPreview - au BufEnter *.md :set textwidth=80 - au BufEnter *.ms :set textwidth=80 - "au BufEnter *.c :colo DevC++ - "au BufEnter *.h :colo DevC++ - "au BufEnter *.cc :colo DevC++ - "au BufEnter *.hh :colo DevC++ - "au BufEnter *.cpp :colo DevC++ - "au BufEnter *.hpp :colo DevC++ - au BufWritePost init.vim :source % - "au BufWritePost *.tex :make - au BufWritePost *sxhkdrc* :!pkill -USR1 -x sxhkd - au BufWritePost .Xresources :!xrdb ~/.Xresources - au BufWritePost .gitignore :!git add .gitignore -augroup end -" }}} -" }}} -" keybindings {{{ - -" direction keys - -inoremap gj -inoremap gk -inoremap g -inoremap g -vnoremap gj -vnoremap gk -vnoremap g -vnoremap g -nnoremap gj -nnoremap gk - -" clear search highlights -nnoremap / :noh - -" toggles -nnoremap tn :set number! -nnoremap tr :set relativenumber! -nnoremap tt :NERDTreeToggle - -" tabs -nnoremap th :tabprevious -nnoremap tl :tabnext -nnoremap tk :tabnew -nnoremap tj :tabclose - -" splits -nnoremap wh :vertical resize -1 -nnoremap wj :resize -1 -nnoremap wk :resize +1 -nnoremap wl :vertical resize +1 - -" config -nnoremap en :e ~/.config/nvim/init.vim -nnoremap ec :source % - -" write as root -nnoremap ZW :w !pkexec tee % >/dev/null - -" Goyo -nnoremap G :Goyo - -" windows -nnoremap h -nnoremap j -nnoremap k -nnoremap l -vnoremap h -vnoremap j -vnoremap k -vnoremap l - -" files -" these may go away soon -nnoremap xx :q -nnoremap x! :q! -" these are the new standard -nnoremap qq :q -nnoremap q! :q! -nnoremap wq :wq -nnoremap ww :w -nnoremap ee :e - -" escape for term windows -tnoremap - -" vim-plug -nnoremap pi :PlugInstall -nnoremap pu :PlugUpdate -nnoremap pU :PlugUpgrade -nnoremap pc :PlugClean - -" fugitive -nnoremap gp :G pull -nnoremap gd :G diff % - -" }}} diff --git a/nvim/lua/colorscheme.lua b/nvim/lua/colorscheme.lua new file mode 100644 index 0000000..66516fa --- /dev/null +++ b/nvim/lua/colorscheme.lua @@ -0,0 +1,8 @@ +-- define your colorscheme here +local colorscheme = 'badwolf' + +local is_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme) +if not is_ok then + vim.notify('colorscheme ' .. colorscheme .. ' not found!') + return +end diff --git a/nvim/lua/keymaps.lua b/nvim/lua/keymaps.lua new file mode 100644 index 0000000..26037c6 --- /dev/null +++ b/nvim/lua/keymaps.lua @@ -0,0 +1,97 @@ +-- define common options +local opts = { + noremap = true, -- non-recursive + silent = true, -- do not show message +} + +-- set leader key +vim.g.mapleader = "'" + +----------------- +-- Normal mode -- +----------------- + +-- Hint: set `:h vim.map.set()` +-- Better window navigation +vim.keymap.set('n', '', 'h', opts) +vim.keymap.set('n', '', 'j', opts) +vim.keymap.set('n', '', 'k', opts) +vim.keymap.set('n', '', 'l', opts) + +-- Resize with arrows +vim.keymap.set('n', '', ':resize -2', opts) +vim.keymap.set('n', '', ':resize +2', opts) +vim.keymap.set('n', '', ':vertical resize -2', opts) +vim.keymap.set('n', '', ':vertical resize +2', opts) +vim.keymap.set('n', 'wh :vertical resize', '-1') +vim.keymap.set('n', 'wj :resize', '-1') +vim.keymap.set('n', 'wk :resize', '+1') +vim.keymap.set('n', 'wl :vertical resize', '+1') + +-- NerdTREE +vim.keymap.set('n', 'tt', ':NERDTreeToggle') + +-- files +-- these may go away soon +vim.keymap.set('n', 'xx', ':q') +vim.keymap.set('n', 'x!', ':q!') + +-- Close with leader +vim.keymap.set('n', 'ww', ':w', opts) +vim.keymap.set('n', 'qq', ':q', opts) +vim.keymap.set('n', 'wq', ':wq', opts) +vim.keymap.set('n', 'q!', ':q!', opts) +vim.keymap.set('n', 'wq', ':wq') +vim.keymap.set('n', 'ee :e', '') + +-- Tabs with leader +vim.keymap.set('n', 'th', ':tabprevious', opts) +vim.keymap.set('n', 'tl', ':tabnext', opts) +vim.keymap.set('n', 'tk', ':tabnew', opts) +vim.keymap.set('n', 'tj', ':tabclose', opts) + +-- Write with sudo +vim.keymap.set('n', 'ZW', ':w !pkexec tee % >/dev/null', opts) + +-- clear search highlights +vim.keymap.set('n', '/', ':noh') + +-- toggles +vim.keymap.set('n', 'tn :set', 'number!') +vim.keymap.set('n', 'tr :set', 'relativenumber!') + +-- write as root +vim.keymap.set('n', 'ZW', ':w !pkexec tee % >/dev/null') + +-- config +vim.keymap.set('n', 'en', ':e ~/.config/nvim/init.lua') +vim.keymap.set('n', 'ec', ':source %') +vim.keymap.set('n', 'er', ':source ~/.config/nvim/init.lua') + +-- Goyo +vim.keymap.set('n', 'G', ':Goyo') + +-- fugitive +vim.keymap.set('n', 'gp :G', 'pull') +vim.keymap.set('n', 'gd :G diff', '%') + +----------------- +-- Visual mode -- +----------------- + +-- Hint: start visual mode with the same area as the previous area and the same mode +--vim.keymap.set('v', '<', '', '>gv', opts) + +-- windows +vim.keymap.set('v', '', 'h') +vim.keymap.set('v', '', 'j') +vim.keymap.set('v', '', 'k') +vim.keymap.set('v', '', 'l') + +-------------- +-- TERMINAL -- +-------------- + +-- escape for term windows +vim.keymap.set('t', '', '') diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua new file mode 100644 index 0000000..1d4826e --- /dev/null +++ b/nvim/lua/options.lua @@ -0,0 +1,32 @@ +-- Hint: use `:h