diff --git a/config/.config/rofi/config.rasi b/config/.config/rofi/config.rasi index e7d8860..9d46b3d 100644 --- a/config/.config/rofi/config.rasi +++ b/config/.config/rofi/config.rasi @@ -1,10 +1,10 @@ configuration{ modi: "drun,filebrowser,window"; lines: 5; - font: "JetBrainsMono Nerd Font Mono 14"; + font: "GeistMono Nerd Font Mono 24"; show-icons: true; icon-theme: "Papirus-Dark"; - terminal: "gnome-terminal"; + terminal: "xfce4-terminal"; drun-display-format: "{icon} {name}"; location: 0; disable-history: false; @@ -25,8 +25,8 @@ element-text, element-icon , mode-switcher { } window { - height: 600px; - width: 600px; + height: 1000px; + width: 1000px; border: 3px; border-color: @border-col; background-color: @bg-col; @@ -78,7 +78,7 @@ element { } element-icon { - size: 32px; + size: 48px; } element selected { diff --git a/config/.config/xfce4/desktop/icons.screen.latest.rc b/config/.config/xfce4/desktop/icons.screen.latest.rc new file mode 120000 index 0000000..3154b07 --- /dev/null +++ b/config/.config/xfce4/desktop/icons.screen.latest.rc @@ -0,0 +1 @@ +/home/jas/.config/xfce4/desktop/icons.screen0-1904x1036.rc \ No newline at end of file diff --git a/config/.config/xfce4/desktop/icons.screen0-1904x1036.rc b/config/.config/xfce4/desktop/icons.screen0-1904x1036.rc new file mode 100644 index 0000000..165ef5f --- /dev/null +++ b/config/.config/xfce4/desktop/icons.screen0-1904x1036.rc @@ -0,0 +1,63 @@ +[xfdesktop-version-4.10.3+-rcfile_format] +4.10.3+=true + +[/home/jas/etc] +row=5 +col=0 + +[/home/jas/var] +row=6 +col=0 + +[/home/jas/usr] +row=7 +col=0 + +[/home/jas/home] +row=0 +col=1 + +[/home/jas/desktop] +row=3 +col=1 + +[/home/jas/root] +row=8 +col=0 + +[/home/jas/sync] +row=1 +col=1 + +[/home/jas/repos] +row=2 +col=1 + +[/home/jas/bin] +row=4 +col=1 + +[/home/jas/admin] +row=5 +col=1 + +[b4f09af3-6495-477c-abdb-29559bcf4e4c] +row=1 +col=0 + +[2025-03-15-09-09-36-00] +row=0 +col=0 + +[Trash] +row=2 +col=0 + +[/] +row=3 +col=0 + +[/home/jas] +row=4 +col=0 + diff --git a/config/.config/xfce4/desktop/icons.screen0-1904x1037.rc b/config/.config/xfce4/desktop/icons.screen0-1904x1037.rc new file mode 100644 index 0000000..165ef5f --- /dev/null +++ b/config/.config/xfce4/desktop/icons.screen0-1904x1037.rc @@ -0,0 +1,63 @@ +[xfdesktop-version-4.10.3+-rcfile_format] +4.10.3+=true + +[/home/jas/etc] +row=5 +col=0 + +[/home/jas/var] +row=6 +col=0 + +[/home/jas/usr] +row=7 +col=0 + +[/home/jas/home] +row=0 +col=1 + +[/home/jas/desktop] +row=3 +col=1 + +[/home/jas/root] +row=8 +col=0 + +[/home/jas/sync] +row=1 +col=1 + +[/home/jas/repos] +row=2 +col=1 + +[/home/jas/bin] +row=4 +col=1 + +[/home/jas/admin] +row=5 +col=1 + +[b4f09af3-6495-477c-abdb-29559bcf4e4c] +row=1 +col=0 + +[2025-03-15-09-09-36-00] +row=0 +col=0 + +[Trash] +row=2 +col=0 + +[/] +row=3 +col=0 + +[/home/jas] +row=4 +col=0 + diff --git a/config/.config/xfce4/desktop/icons.screen0-3824x2117.rc b/config/.config/xfce4/desktop/icons.screen0-3824x2117.rc new file mode 100644 index 0000000..65c7c3e --- /dev/null +++ b/config/.config/xfce4/desktop/icons.screen0-3824x2117.rc @@ -0,0 +1,23 @@ +[xfdesktop-version-4.10.3+-rcfile_format] +4.10.3+=true + +[b4f09af3-6495-477c-abdb-29559bcf4e4c] +row=1 +col=0 + +[2025-03-15-09-09-36-00] +row=0 +col=0 + +[Trash] +row=2 +col=0 + +[/] +row=3 +col=0 + +[/home/jas] +row=4 +col=0 + diff --git a/config/.config/xfce4/helpers.rc b/config/.config/xfce4/helpers.rc new file mode 100644 index 0000000..c18615e --- /dev/null +++ b/config/.config/xfce4/helpers.rc @@ -0,0 +1,3 @@ +WebBrowser=custom-WebBrowser +TerminalEmulator=xfce4-terminal + diff --git a/config/.config/xfce4/panel/genmon-5.rc b/config/.config/xfce4/panel/genmon-5.rc new file mode 100644 index 0000000..831819c --- /dev/null +++ b/config/.config/xfce4/panel/genmon-5.rc @@ -0,0 +1,6 @@ +Command=uptime -p +UseLabel=0 +Text=(genmon) +UpdatePeriod=30000 +Font=Rubik Bold 10 + diff --git a/config/.config/xfce4/panel/genmon-9.rc b/config/.config/xfce4/panel/genmon-9.rc new file mode 100644 index 0000000..c7b6b49 --- /dev/null +++ b/config/.config/xfce4/panel/genmon-9.rc @@ -0,0 +1,6 @@ +Command=/home/jas/bin/check_updates +UseLabel=0 +Text=(genmon) +UpdatePeriod=3600000 +Font=Rubik Bold 10 + diff --git a/config/.config/xfce4/panel/xfce4-clipman-actions.xml b/config/.config/xfce4/panel/xfce4-clipman-actions.xml new file mode 100644 index 0000000..84ea9b3 --- /dev/null +++ b/config/.config/xfce4/panel/xfce4-clipman-actions.xml @@ -0,0 +1,44 @@ + + + + Bugz + bug\s*#?\s*([0-9]+) + 0 + + + GNOME Bug + exo-open http://bugzilla.gnome.org/show_bug.cgi?id=\1 + + + Xfce Bug + exo-open http://bugzilla.xfce.org/show_bug.cgi?id=\1 + + + + + Image + (http|ftp).+\.(jpg|png|gif) + 0 + + + View with Ristretto + ristretto "\0" + + + Edit with Gimp + gimp-remote "\0" + + + + + Long URL + http://[^\s]{120,} + 0 + + + Shrink the URL + exo-open http://tinyurl.com/create.php?url=\0 + + + + \ No newline at end of file diff --git a/config/.config/xfce4/terminal/terminalrc b/config/.config/xfce4/terminal/terminalrc new file mode 100644 index 0000000..183dee9 --- /dev/null +++ b/config/.config/xfce4/terminal/terminalrc @@ -0,0 +1,50 @@ +[Configuration] +MiscAlwaysShowTabs=FALSE +MiscBell=FALSE +MiscBellUrgent=FALSE +MiscBordersDefault=FALSE +MiscCursorBlinks=FALSE +MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK +MiscDefaultGeometry=80x24 +MiscInheritGeometry=FALSE +MiscMenubarDefault=FALSE +MiscMouseAutohide=FALSE +MiscMouseWheelZoom=TRUE +MiscToolbarDefault=FALSE +MiscConfirmClose=TRUE +MiscCycleTabs=TRUE +MiscTabCloseButtons=TRUE +MiscTabCloseMiddleClick=FALSE +MiscTabPosition=GTK_POS_TOP +MiscHighlightUrls=TRUE +MiscMiddleClickOpensUri=FALSE +MiscCopyOnSelect=TRUE +MiscShowRelaunchDialog=TRUE +MiscRewrapOnResize=TRUE +MiscUseShiftArrowsToScroll=FALSE +MiscSlimTabs=FALSE +MiscNewTabAdjacent=FALSE +MiscSearchDialogOpacity=100 +MiscShowUnsafePasteDialog=FALSE +MiscRightClickAction=TERMINAL_RIGHT_CLICK_ACTION_CONTEXT_MENU +ScrollingOnOutput=TRUE +ScrollingBar=TERMINAL_SCROLLBAR_NONE +ScrollingUnlimited=TRUE +DropdownWidth=100 +DropdownHeight=75 +DropdownAlwaysShowTabs=FALSE +FontUseSystem=TRUE +ColorForeground=#cdd6f4 +ColorBackground=#1e1e2e +ColorCursorForeground=#11111b +ColorCursor=#f5e0dc +ColorCursorUseDefault=FALSE +ColorSelection=#cdd6f4 +ColorSelectionBackground=#585b70 +ColorSelectionUseDefault=FALSE +ColorPalette=#45475a;#f38ba8;#a6e3a1;#f9e2af;#89b4fa;#f5c2e7;#94e2d5;#bac2de;#585b70;#f38ba8;#a6e3a1;#f9e2af;#89b4fa;#f5c2e7;#94e2d5;#a6adc8 +TabActivityColor=#fab387 +ShortcutsNoHelpkey=TRUE +ShortcutsNoMenukey=TRUE +ShortcutsNoMnemonics=TRUE + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml new file mode 100644 index 0000000..b1ccf21 --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml new file mode 100644 index 0000000..9ddc443 --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml new file mode 100644 index 0000000..43cc217 --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml new file mode 100644 index 0000000..c2b52a5 --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml new file mode 100644 index 0000000..20c1aa3 --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml new file mode 100644 index 0000000..e456df2 --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new file mode 100644 index 0000000..fc0d135 --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml new file mode 100644 index 0000000..bbad095 --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new file mode 100644 index 0000000..881b0c2 --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml new file mode 100644 index 0000000..9dd5b6e --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new file mode 100644 index 0000000..7c81b6c --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new file mode 100644 index 0000000..31a5c18 --- /dev/null +++ b/config/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/.config/zellij/config.kdl b/config/.config/zellij/config.kdl index eca2cfa..27a3769 100644 --- a/config/.config/zellij/config.kdl +++ b/config/.config/zellij/config.kdl @@ -1,5 +1,5 @@ copy_clipboard "system" -copy_command "wl-copy" +copy_command "xclip -selection clipboard" copy_on_select true theme "catppuccin-mocha" themes { diff --git a/config/.config/zellij/layouts/default.kdl b/config/.config/zellij/layouts/default.kdl index ddce63c..744e4d0 100644 --- a/config/.config/zellij/layouts/default.kdl +++ b/config/.config/zellij/layouts/default.kdl @@ -25,12 +25,12 @@ layout { } tab name="rpi400 (Debian)" { pane command="autossh" { - args "jas@rpi400.headscale.moonshadow.dev" + args "root@rpi400.headscale.moonshadow.dev" } } tab name="logs" { pane command="sudo" { - args "lnav" "/var/log/forwarded" "jas@moonshadow.headscale.moonshadow.dev:/var/log/httpd-access.log" + args "/home/linuxbrew/.linuxbrew/bin/lnav" "/var/log/forwarded" "jas@moonshadow.headscale.moonshadow.dev:/var/log/httpd-access.log" } } tab name="tilde.team IRC" { @@ -38,10 +38,5 @@ layout { args "hyperreal@tilde.team" } } - tab name="RSS" { - pane command="newsboat" { - args "-r" - } - } tab } diff --git a/doom/.doom.d/config.el b/doom/.doom.d/config.el index 95ba5b3..8402fbf 100644 --- a/doom/.doom.d/config.el +++ b/doom/.doom.d/config.el @@ -17,7 +17,7 @@ (remove ".git" projectile-project-root-files-bottom-up))) ;; Set fonts -(setq fontsize 15) +(setq fontsize 28) (setq monofontfam "GeistMono Nerd Font Mono") (setq doom-font (font-spec :family monofontfam :size fontsize) doom-variable-pitch-font (font-spec :family monofontfam :size fontsize) diff --git a/just/.justfile b/just/.justfile index 18b2f4e..bdfb7ca 100644 --- a/just/.justfile +++ b/just/.justfile @@ -3,6 +3,7 @@ dotfiles_repo := "/home/jas/repos/git.hyperreal.coffee/hyperreal/dotfiles" homedir := "/home/jas" configdir := "/home/jas/.config" +localshare := "/home/jas/.local/share" refresh-doom-emacs: rm -rf {{configdir}}/emacs @@ -17,8 +18,11 @@ deploy-dotfiles: cp -rfv {{dotfiles_repo}}/config/.config/bat {{configdir}} cp -rfv {{dotfiles_repo}}/config/.config/git {{configdir}} cp -rfv {{dotfiles_repo}}/config/.config/newsboat {{configdir}} + cp -rfv {{dotfiles_repo}}/config/.config/rofi {{configdir}} cp -fv {{dotfiles_repo}}/config/.config/starship.toml {{configdir}} + cp -rfv {{dotfiles_repo}}/config/.config/xfce4 {{configdir}} cp -rfv {{dotfiles_repo}}/config/.config/zellij {{configdir}} + cp -rfv {{dotfiles_repo}}/local/.local/share/xfce4 {{localshare}} save-dotfiles: cp -fv {{homedir}}/.justfile {{dotfiles_repo}}/just/ @@ -28,8 +32,11 @@ save-dotfiles: cp -rfv {{configdir}}/bat {{dotfiles_repo}}/config/.config/ cp -rfv {{configdir}}/git {{dotfiles_repo}}/config/.config/ cp -rfv {{configdir}}/newsboat {{dotfiles_repo}}/config/.config/ + cp -rfv {{configdir}}/rofi {{dotfiles_repo}}/config/.config/ cp -fv {{configdir}}/starship.toml {{dotfiles_repo}}/config/.config/ + cp -rfv {{configdir}}/xfce4 {{dotfiles_repo}}/config/.config/ cp -rfv {{configdir}}/zellij {{dotfiles_repo}}/config/.config/ + cp -rfv {{localshare}}/xfce4 {{dotfiles_repo}}/local/.local/share/ clean-dotfiles: rm -fv {{homedir}}/.justfile @@ -39,6 +46,7 @@ clean-dotfiles: rm -rfv {{configdir}}/bat rm -rfv {{configdir}}/git rm -rfv {{configdir}}/newsboat + rm -rfv {{configdir}}/rofi rm -fv {{configdir}}/starship.toml rm -rfv {{configdir}}/zellij @@ -86,17 +94,28 @@ tailscale: sudo tailscale up neovim: - sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' - - mkdir -p "${HOME}/.config/nvim" - wget https://files.hyperreal.coffee/init.vim -O "${HOME}/.config/nvim/init.vim" - nvim +PlugInstall +q +q + sudo apt install -y npm + git clone https://git.hyperreal.coffee/hyperreal/nvim-config ~/.config/nvim + nvim neovim-root: - sudo sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' + sudo apt install -y npm + sudo mkdir -p /root/.config + sudo git clone https://git.hyperreal.coffee/hyperreal/nvim-config /root/.config/nvim + sudo nvim - sudo mkdir -p /root/.config/nvim - sudo wget https://files.hyperreal.coffee/init.vim -O /root/.config/nvim/init.vim - sudo nvim +PlugInstall +q +q +xfce4-docklike-plugin: + #!/usr/bin/env bash + sudo apt install -y build-essential automake autoconf intltool libx11-dev libgio2.0-cil-dev libglib2.0-dev libgtk2.0-dev libgtk-3-dev libwnck-dev libwnck-3-dev libxfce4ui-2-dev libxfce4panel-2.0-dev + URL=$(curl --silent "https://api.github.com/repos/davekeogh/xfce4-docklike-plugin/releases/latest" | grep "browser_download_url" | grep "\.tar.gz" | cut -d : -f 2,3 | tr -d '" ') + FILENAME=$(echo "$URL" | cut -d / -f 9) + BASENAME=$(basename -s .tar.gz "$FILENAME") + cd ~/downloads + wget "$URL" + tar xvf "$FILENAME" + cd "$BASENAME" + ./configure + make + sudo make install + cd .. + rm -rf "$BASENAME"* diff --git a/local/.local/share/xfce4/helpers/custom-WebBrowser.desktop b/local/.local/share/xfce4/helpers/custom-WebBrowser.desktop new file mode 100644 index 0000000..838a178 --- /dev/null +++ b/local/.local/share/xfce4/helpers/custom-WebBrowser.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +NoDisplay=true +Version=1.0 +Encoding=UTF-8 +Type=X-XFCE-Helper +X-XFCE-Category=WebBrowser +X-XFCE-CommandsWithParameter=librewolf "%s" +Icon=librewolf +Name=librewolf +X-XFCE-Commands=librewolf + diff --git a/local/.local/share/xfce4/terminal/colorschemes/catppuccin-mocha.theme b/local/.local/share/xfce4/terminal/colorschemes/catppuccin-mocha.theme index 2850e69..6441070 100644 --- a/local/.local/share/xfce4/terminal/colorschemes/catppuccin-mocha.theme +++ b/local/.local/share/xfce4/terminal/colorschemes/catppuccin-mocha.theme @@ -9,4 +9,4 @@ ColorSelectionBackground=#585b70 ColorSelection=#cdd6f4 ColorSelectionUseDefault=FALSE TabActivityColor=#fab387 -ColorPalette=#45475a;#f38ba8;#a6e3a1;#f9e2af;#89b4fa;#f5c2e7;#94e2d5;#bac2de;#585b70;#f38ba8;#a6e3a1;#f9e2af;#89b4fa;#f5c2e7;#94e2d5;#a6adc8 +ColorPalette=#45475a;#f38ba8;#a6e3a1;#f9e2af;#89b4fa;#f5c2e7;#94e2d5;#bac2de;#585b70;#f38ba8;#a6e3a1;#f9e2af;#89b4fa;#f5c2e7;#94e2d5;#a6adc8 \ No newline at end of file diff --git a/zsh/.zshrc.d/aliases.zsh b/zsh/.zshrc.d/aliases.zsh index 56181ac..e235898 100644 --- a/zsh/.zshrc.d/aliases.zsh +++ b/zsh/.zshrc.d/aliases.zsh @@ -41,7 +41,7 @@ if [ -e "/etc/redhat-release" ]; then fi # The ls family -if test -x "$(command -v lsd)"; then +if test -f /home/linuxbrew/.linuxbrew/bin/lsd; then alias ls='lsd' alias la='lsd -a' alias ll='lsd -l' @@ -65,11 +65,7 @@ alias rm='rm -i' alias zfun='functions | bat -l zsh' # Use bat -if [ -f "$(command -v batcat)" ]; then - alias cat='batcat -p' -fi - -if [ -f "$(command -v bat)" ]; then +if test -f /home/linuxbrew/.linuxbrew/bin/bat; then alias cat='bat -p' fi @@ -80,7 +76,7 @@ alias -g G='| grep' alias -g L='| less -FRX' alias -g B='| bat' alias -g J='| jq' -alias -g CC='| wl-copy' +alias -g CC='| xclip -selection clipboard' alias -g C='| wc -l' # Get public IP address diff --git a/zsh/.zshrc.d/functions.zsh b/zsh/.zshrc.d/functions.zsh index 05f3dc5..6f875ba 100644 --- a/zsh/.zshrc.d/functions.zsh +++ b/zsh/.zshrc.d/functions.zsh @@ -57,9 +57,9 @@ function rmknownhosts() { rm -v "${HOME}/.ssh/known_hosts"* } -# Copy SSH public key to clipboard (requires wl-copy) +# Copy SSH public key to clipboard (requires xclip -selection clipboard) function pubkey() { - cat "${HOME}/.ssh/id_ed25519.pub" | tr -d '\n' | wl-copy + cat "${HOME}/.ssh/id_ed25519.pub" | tr -d '\n' | xclip -selection clipboard echo "--> SSH public key copied to clipboard" }