diff --git a/applications/.local/share/applications/custom/DBeaver.desktop b/applications/.local/share/applications/custom/DBeaver.desktop index 4d7acce..9d6f9d7 100755 --- a/applications/.local/share/applications/custom/DBeaver.desktop +++ b/applications/.local/share/applications/custom/DBeaver.desktop @@ -1,13 +1,8 @@ [Desktop Entry] -Version=1.0 -Type=Application -Terminal=false Name=DBeaver GenericName=SQL Database Client Comment=Universal Database Manager and SQL Client. -Exec=bash -c "JAVA_HOME=/usr/lib/jvm/default GDK_BACKEND=x11 GTK_THEME=Raleigh /usr/bin/dbeaver" -Categories=IDE;Development -WM_CLASS=DBeaver -StartupWMClass=DBeaver +Exec=env GDK_BACKEND=x11 GTK_THEME=Raleigh dbeaver +Categories=IDE;Development; StartupNotify=true -Icon=/usr/share/pixmaps/dbeaver.png +Icon=dbeaver \ No newline at end of file diff --git a/applications/.local/share/applications/custom/Lens.desktop b/applications/.local/share/applications/custom/Lens.desktop deleted file mode 100644 index f7daa3d..0000000 --- a/applications/.local/share/applications/custom/Lens.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Lens -GenericName=Kubernetes IDE -Comment=The Kubernetes IDE -Icon=/home/forbi/.local/share/applications/custom/lens.png -Exec=/home/forbi/.local/bin/openlens.sh %U -Categories=System; -StartupNotify=true -StartupWMClass=Lens -MimeType=x-scheme-handler/lens; diff --git a/applications/.local/share/applications/custom/NoSQL.desktop b/applications/.local/share/applications/custom/NoSQL.desktop deleted file mode 100755 index 331dd12..0000000 --- a/applications/.local/share/applications/custom/NoSQL.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=NoSQL Booster -Exec=/home/forbi/.local/bin/nosql.sh -Icon=~/.local/share/applications/custom/mongo.png -Version=1.0 -Type=Application -Terminal=0 - diff --git a/applications/.local/share/applications/custom/Recorder.desktop b/applications/.local/share/applications/custom/Recorder.desktop deleted file mode 100755 index 1fb6764..0000000 --- a/applications/.local/share/applications/custom/Recorder.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Terminal=false -Name=Screen Recorder -GenericName=Screen Recorder -Exec= /home/forbi/.local/bin/wlrecord.sh -s -Categories=Utility;Application; -StartupWMClass=Screen Recorder -StartupNotify=true -Icon=/usr/share/icons/ePapirus/24x24/actions/kdenlive-hide-video.svg diff --git a/applications/.local/share/applications/custom/Redis.desktop b/applications/.local/share/applications/custom/Redis.desktop deleted file mode 100755 index b680d4f..0000000 --- a/applications/.local/share/applications/custom/Redis.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Terminal=false -Name=Redis -GenericName=Redis Viewer -Exec=/home/forbi/.local/bin/redis.sh -Categories=IDE;Development -StartupWMClass=Redis -StartupNotify=true -Icon=/home/forbi/.local/share/applications/custom/redis.png diff --git a/applications/.local/share/applications/custom/lens.jpg b/applications/.local/share/applications/custom/lens.jpg deleted file mode 100644 index ef16534..0000000 Binary files a/applications/.local/share/applications/custom/lens.jpg and /dev/null differ diff --git a/applications/.local/share/applications/custom/lens.png b/applications/.local/share/applications/custom/lens.png deleted file mode 100644 index 11ede9d..0000000 Binary files a/applications/.local/share/applications/custom/lens.png and /dev/null differ diff --git a/applications/.local/share/applications/custom/mongo.png b/applications/.local/share/applications/custom/mongo.png deleted file mode 100644 index 796681b..0000000 Binary files a/applications/.local/share/applications/custom/mongo.png and /dev/null differ diff --git a/applications/.local/share/applications/custom/nvim-kitty.desktop b/applications/.local/share/applications/custom/nvim-kitty.desktop new file mode 100644 index 0000000..c37ef68 --- /dev/null +++ b/applications/.local/share/applications/custom/nvim-kitty.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Neovim (Kitty) +GenericName=Text Editor +Comment=Open files with Neovim in Kitty terminal +Exec=kitty --class=nvim-editor nvim %F +Categories=TextEditor;Development;Utility; +StartupNotify=true +Icon=nvim +Terminal=false diff --git a/applications/.local/share/applications/custom/nvim.desktop b/applications/.local/share/applications/custom/nvim.desktop deleted file mode 100644 index 5493731..0000000 --- a/applications/.local/share/applications/custom/nvim.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Kitty+Neovim -Comment=Open Neovim in Kitty terminal -Exec=kitty -e nvim %F -Icon=nvim -Terminal=false -Categories=Utility;TextEditor; -MimeType=text/plain; diff --git a/applications/.local/share/applications/custom/redis.png b/applications/.local/share/applications/custom/redis.png deleted file mode 100644 index 021c412..0000000 Binary files a/applications/.local/share/applications/custom/redis.png and /dev/null differ diff --git a/applications/.local/share/applications/custom/sublime_merge.desktop b/applications/.local/share/applications/custom/sublime_merge.desktop deleted file mode 100644 index c03c8e1..0000000 --- a/applications/.local/share/applications/custom/sublime_merge.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Sublime Merge -GenericName=Git Client -Comment=Sublime Merge is a Git client, from the makers of Sublime Text -Exec=/home/forbi/.bin/sm.sh %F -Terminal=false -MimeType=text/plain; -Icon=sublime-merge -Categories=Development; -StartupNotify=true -Actions=new-window; - -[Desktop Action new-window] -Name=New Window -Exec=/home/forbi/.bin/sm --launch-or-new-window -OnlyShowIn=Unity; diff --git a/config/.config/env b/config/.config/env old mode 100755 new mode 100644 index d01bd78..f2d8bb6 --- a/config/.config/env +++ b/config/.config/env @@ -1,12 +1,16 @@ export EDITOR="nvim" + +# Basic environment variables export TERMINAL="kitty" export LANG=en_US.UTF-8 -export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-~/.config} -export XDG_CACHE_HOME=${XDG_CACHE_HOME:-~/.cache} -export XDG_DATA_HOME=${XDG_DATA_HOME:-~/.local/share} -export XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-~/.xdg} -export XDG_STATE_HOME=${XDG_STATE_HOME:-~/.local/state} -export ZDOTDIR=${ZDOTDIR:-$XDG_CONFIG_HOME/zsh} + +# XDG Base Directory Spec +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" +export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}" +export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}" + +# Program-specific XDG configurations export WAKATIME_HOME=$XDG_CONFIG_HOME/wakatime export ZSH_WAKATIME_BIN=$XDG_CONFIG_HOME/wakatime/.wakatime/wakatime-cli export W3M_DIR=$XDG_DATA_HOME/w3m @@ -18,32 +22,10 @@ export GRADLE_USER_HOME=$XDG_DATA_HOME/gradle export GOPATH=$XDG_DATA_HOME/go export DOCKER_CONFIG=$XDG_CONFIG_HOME/docker export CARGO_HOME=$XDG_DATA_HOME/cargo -# bash history export HISTFILE=${XDG_STATE_HOME}/bash/history export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" export WGETRC="$XDG_CONFIG_HOME/wgetrc" export JAVA_HOME="/usr/lib/jvm/default" -export BROWSER=zen-browser -unset SSH_AGENT_PID -if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then - export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" -fi -export GNUHOME="$XDG_DATA_HOME/gnupg" -export GPG_TTY=$(tty) -gpg-connect-agent updatestartuptty /bye >/dev/null -# Wayland/Sway specific environment variables -export MOZ_ENABLE_WAYLAND=1 -export QT_QPA_PLATFORM=wayland-egl -export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 -export QT_QPA_PLATFORMTHEME=qt5ct -export QT_STYLE_OVERRIDE=kvantum -export CLUTTER_BACKEND=wayland -export GDK_BACKEND=wayland -export ECORE_EVAS_ENGINE=wayland_egl -export ELM_ENGINE=wayland_wgl -export SDL_VIDEODRIVER=wayland -export _JAVA_AWT_WM_NONREPARENTING=1 -export XDG_CURRENT_DESKTOP=niri -#export XDG_CURRENT_DESKTOP=sway -export XDG_SESSION_TYPE=wayland +# PATH additions +export PATH="$HOME/.local/bin:$PATH" diff --git a/config/.config/environment.d/50-cursor.conf b/config/.config/environment.d/50-cursor.conf new file mode 100644 index 0000000..865b656 --- /dev/null +++ b/config/.config/environment.d/50-cursor.conf @@ -0,0 +1,4 @@ +export XCURSOR_THEME="Bibata-Original-Classic" +export XCURSOR_SIZE=24 + + diff --git a/config/.config/gtk-3.0/settings.ini b/config/.config/gtk-3.0/settings.ini new file mode 100644 index 0000000..8ceac44 --- /dev/null +++ b/config/.config/gtk-3.0/settings.ini @@ -0,0 +1,16 @@ +[Settings] +gtk-theme-name=rose-pine-gtk-theme-unstable-latest-Dark +gtk-icon-theme-name=Papirus +gtk-font-name=Adwaita Sans 11 +gtk-cursor-theme-name=Bibata-Original-Ice +gtk-cursor-theme-size=24 +gtk-toolbar-style=GTK_TOOLBAR_BOTH +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=1 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=0 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintfull +gtk-xft-rgba=none diff --git a/config/.config/mimeapps.list b/config/.config/mimeapps.list new file mode 100644 index 0000000..c4c7f56 --- /dev/null +++ b/config/.config/mimeapps.list @@ -0,0 +1,24 @@ +[Default Applications] +text/html=zen.desktop +x-scheme-handler/http=zen.desktop +x-scheme-handler/https=zen.desktop +x-scheme-handler/about=zen.desktop +x-scheme-handler/unknown=zen.desktop +text/plain=nvim-kitty.desktop +text/x-python=nvim-kitty.desktop +text/x-javascript=nvim-kitty.desktop +text/x-typescript=nvim-kitty.desktop +text/x-rust=nvim-kitty.desktop +text/x-go=nvim-kitty.desktop +text/x-nix=nvim-kitty.desktop +text/x-lua=nvim-kitty.desktop +text/x-css=nvim-kitty.desktop +text/x-yaml=nvim-kitty.desktop +text/x-json=nvim-kitty.desktop +text/x-toml=nvim-kitty.desktop +text/x-markdown=nvim-kitty.desktop +text/x-shellscript=nvim-kitty.desktop +text/x-dockerfile=nvim-kitty.desktop +application/xml=nvim-kitty.desktop +application/x-extension-html=nvim-kitty.desktop +x-scheme-handler/discord=vesktop.desktop diff --git a/config/.config/qt5ct/qt5ct.conf b/config/.config/qt5ct/qt5ct.conf new file mode 100644 index 0000000..782a3a0 --- /dev/null +++ b/config/.config/qt5ct/qt5ct.conf @@ -0,0 +1,5 @@ +[Qt] +cursorTheme=Bibata-Original-Classic +cursorSize=24 + + diff --git a/config/.config/user-dirs.dirs b/config/.config/user-dirs.dirs new file mode 100644 index 0000000..b57ef12 --- /dev/null +++ b/config/.config/user-dirs.dirs @@ -0,0 +1,8 @@ +XDG_DESKTOP_DIR="$HOME/Desktop" +XDG_DOCUMENTS_DIR="$HOME/Documents" +XDG_DOWNLOAD_DIR="$HOME/Downloads" +XDG_MUSIC_DIR="$HOME/Music" +XDG_PICTURES_DIR="$HOME/Pictures" +XDG_PUBLICSHARE_DIR="$HOME/Public" +XDG_TEMPLATES_DIR="$HOME/Templates" +XDG_VIDEOS_DIR="$HOME/Videos" diff --git a/git/.config/git/config b/git/.config/git/config index beefbcb..9751331 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -4,123 +4,124 @@ signingkey = E54F23DDA33256B4BC82B7184C73BAD25156DACE [core] - autocrlf = input - excludesfile = ~/.config/git/.gitignore - compression = 9 - whitespace = error - preloadindex = true + autocrlf = input + excludesfile = ~/.config/git/.gitignore + compression = 9 + whitespace = error + preloadindex = true [include] - path = ~/.config/git/gitalias.ini + path = ~/.config/git/gitalias.ini [includeIf "gitdir:~/Sync/"] - path = ~/Sync/Obsidian/.gitconfig + path = ~/Sync/Obsidian/.gitconfig [advice] - addEmptyPathspec = false - pushNonFastForward = false - statusHints = false + addEmptyPathspec = false + pushNonFastForward = false + statusHints = false [status] - branch = true - showStash = true - showUntrackedFiles = all + branch = true + showStash = true + showUntrackedFiles = all [color] - ui = true + ui = true [color "diff-highlight"] - oldNormal = red bold - oldHighlight = red bold 52 - newNormal = green bold - newHighlight = green bold 22 + oldNormal = red bold + oldHighlight = red bold 52 + newNormal = green bold + newHighlight = green bold 22 [color "diff"] - meta = black bold - frag = magenta - context = white - whitespace = yellow reverse - old = red + meta = black bold + frag = magenta + context = white + whitespace = yellow reverse + old = red [color "blame"] - highlightRecent = 237, 20 month ago, 238, 19 month ago, 239, 18 month ago, 240, 17 month ago, 241, 16 month ago, 242, 15 month ago, 243, 14 month ago, 244, 13 month ago, 245, 12 month ago, 246, 11 month ago, 247, 10 month ago, 248, 9 month ago, 249, 8 month ago, 250, 7 month ago, 251, 6 month ago, 252, 5 month ago, 253, 4 month ago, 254, 3 month ago, 231, 2 month ago, 230, 1 month ago, 229, 3 weeks ago, 228, 2 weeks ago, 227, 1 week ago, 226 + highlightRecent = 237, 20 month ago, 238, 19 month ago, 239, 18 month ago, 240, 17 month ago, 241, 16 month ago, 242, 15 month ago, 243, 14 month ago, 244, 13 month ago, 245, 12 month ago, 246, 11 month ago, 247, 10 month ago, 248, 9 month ago, 249, 8 month ago, 250, 7 month ago, 251, 6 month ago, 252, 5 month ago, 253, 4 month ago, 254, 3 month ago, 231, 2 month ago, 230, 1 month ago, 229, 3 weeks ago, 228, 2 weeks ago, 227, 1 week ago, 226 [color "decorate"] - HEAD = red - branch = blue - tag = yellow - remoteBranch = magenta + HEAD = red + branch = blue + tag = yellow + remoteBranch = magenta [color "branch"] - current = magenta - local = default - remote = yellow - upstream = green - plain = blue + current = magenta + local = default + remote = yellow + upstream = green + plain = blue [interactive] - ; diffFilter = diff-so-fancy --patch - singlekey = true + ; diffFilter = diff-so-fancy --patch + singlekey = true [credential] - helper = /usr/lib/git-core/git-credential-libsecret + helper = /usr/lib/git-core/git-credential-libsecret [merge] - tool = fugitive - conflictStyle = diff3 + tool = fugitive + conflictStyle = diff3 [icdiff] - options = --highlight --line-numbers + options = --highlight --line-numbers [diff] - context = 3 - renames = copies - interHunkContext = 10 + context = 3 + renames = copies + interHunkContext = 10 ; [pager] -; pager = diff-so-fancy | less --tabs=4 -RF +; pager = diff-so-fancy | less --tabs=4 -RF [diff-so-fancy] - markEmptyLines = false + markEmptyLines = false [init] - defaultBranch = master + defaultBranch = master [pull] - rebase = true - default = current + rebase = true + default = current [push] - autoSetupRemote = true - default = current - followTags = true + autoSetupRemote = true + default = current + followTags = true [rebase] - autoStash = true - missingCommitsCheck = warn + autoStash = true + missingCommitsCheck = warn [commit] - gpgsign = true + gpgsign = true [log] - abbrevCommit = true - graphColors = blue,yellow,cyan,magenta,green,red + abbrevCommit = true + graphColors = blue,yellow,cyan,magenta,green,red [url "https://github.com/RustSec/advisory-db"] - insteadOf = https://github.com/RustSec/advisory-db + insteadOf = https://github.com/RustSec/advisory-db [url "git@github.com:marianozunino/"] - insteadOf = "mz:" + insteadOf = "mz:" [url "git@github.com:Stuzo/"] - insteadOf = "stuzo:" + insteadOf = "stuzo:" [filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true [alias] - bb = !better-git-branch.sh - to = !git branch --set-upstream-to=origin/$(git branch --show-current) + bb = !better-git-branch.sh + to = !git branch --set-upstream-to=origin/$(git branch --show-current) + diff --git a/local-bin/.local/bin/randwall b/local-bin/.local/bin/randwall index e10c4f3..f7e186e 100755 --- a/local-bin/.local/bin/randwall +++ b/local-bin/.local/bin/randwall @@ -9,7 +9,7 @@ set_wallpaper_sway() { if [ "$(hostname)" == "main" ]; then swaymsg -t get_outputs -r | jq -r ".[].name" | parallel 'swaybg -o {} -i $(find ~/Pictures/* -type f | shuf -n 1) &' elif [ "$(hostname)" == "fw" ]; then - swaybg -m fill -i "/home/mzunino/Pictures/hwtioswoamne1.jpeg" + swaybg -m fill -i "$HOME/Pictures/hwtioswoamne1.jpeg" fi } diff --git a/sway/.config/sway/config.d/appearance b/sway/.config/sway/config.d/appearance index 7a165f7..f204e58 100644 --- a/sway/.config/sway/config.d/appearance +++ b/sway/.config/sway/config.d/appearance @@ -11,8 +11,8 @@ client.focused #19141D #19141D #CACACA #19141D #CACACA gaps inner 5 gaps outer 5 -# Enable XWayland -xwayland enable +# Cursor Configuration +seat seat0 xcursor_theme Bibata-Original-Classic 24 # SwayFX Settings # smart_corner_radius on diff --git a/sway/.config/sway/config.d/autostart b/sway/.config/sway/config.d/autostart index 997fead..f8c1fce 100644 --- a/sway/.config/sway/config.d/autostart +++ b/sway/.config/sway/config.d/autostart @@ -1,7 +1,7 @@ # vim: ft=swayconfig # System Services exec { - # /usr/lib/mate-polkit/polkit-mate-authentication-agent-1 + $(nix-locate -w polkit-gnome-authentication-agent-1 | awk '{print $NF}') blueman-applet nm-applet swaync @@ -22,7 +22,7 @@ exec { davmail thunderbird zen - # obsidian + obsidian localsend_app vesktop } diff --git a/sway/.config/sway/config.d/variables b/sway/.config/sway/config.d/variables index db99d2b..f7885e9 100644 --- a/sway/.config/sway/config.d/variables +++ b/sway/.config/sway/config.d/variables @@ -3,6 +3,7 @@ set { $mod Mod4 $term kitty $menu fuzzel + $polkit polkit-gnome-authentication-agent-1 $left h $down j $up k diff --git a/waybar/.config/waybar/common.jsonc b/waybar/.config/waybar/common.jsonc index 376158a..a2aff4b 100644 --- a/waybar/.config/waybar/common.jsonc +++ b/waybar/.config/waybar/common.jsonc @@ -203,7 +203,7 @@ }, "custom/randwall": { "format": "󰏘", - "on-click": "$HOME/.bin/randwall", - "on-click-right": "$HOME/.bin/randwall" + "on-click": "$HOME/.local/bin/randwall", + "on-click-right": "$HOME/.local/bin/randwall" } } diff --git a/zsh/.config/zsh/alias.zsh b/zsh/.config/zsh/alias.zsh index 51afeee..b0ba57c 100644 --- a/zsh/.config/zsh/alias.zsh +++ b/zsh/.config/zsh/alias.zsh @@ -57,8 +57,8 @@ alias doomconf="vim ~/.config/gzdoom/gzdoom.ini" alias pluginconf="vim ~/.config/nvim/plugins.vim" alias i3conf="vim ~/.config/i3/config" alias cssh="vim ~/.ssh/config" +alias nv="nix run github:vic/nix-versions --"; alias sm="sublime_merge" -alias nv = "nix run github:vic/nix-versions --"; function vimwhich { nvim $(which $1) diff --git a/zsh/.config/zsh/functions.zsh b/zsh/.config/zsh/functions.zsh index 2a10023..12b637c 100644 --- a/zsh/.config/zsh/functions.zsh +++ b/zsh/.config/zsh/functions.zsh @@ -718,7 +718,6 @@ abcdefghijklmnopqrstuvwxyz echo "$preview_text" | font-manager extract "$font_name" && echo "$preview_text" } - yay() { case "$1" in # System update @@ -733,7 +732,6 @@ yay() { echo "Searching for '$2'..." nix search nixpkgs "$2" 2>/dev/null || nix-env -qaP | grep -i "$2" ;; - # Install package to user environment install|"-S") [ -z "$2" ] && { echo "Usage: yay install "; return 1; } @@ -803,3 +801,4 @@ EOF function nas() { rclone mount --vfs-cache-mode writes --dir-cache-time 5s --no-check-certificate --allow-other nas: /home/mzunino/nas } + diff --git a/zsh/.config/zsh/zsh_history_main b/zsh/.config/zsh/zsh_history_main deleted file mode 100644 index da3e478..0000000 Binary files a/zsh/.config/zsh/zsh_history_main and /dev/null differ