diff --git a/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml index 796061d..83d2f89 100644 --- a/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +++ b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml @@ -32,34 +32,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-panel.xml index 1540182..2a8955e 100644 --- a/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -118,6 +118,7 @@ + diff --git a/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml new file mode 100644 index 0000000..db79ab5 --- /dev/null +++ b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xsettings.xml b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xsettings.xml index 31a5c18..d963b16 100644 --- a/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xsettings.xml +++ b/config/xfce4-desktop/xfconf/xfce-perchannel-xml/xsettings.xml @@ -24,7 +24,7 @@ - + diff --git a/config/zellij/config.kdl b/config/zellij/config.kdl index 27a3769..71d125a 100644 --- a/config/zellij/config.kdl +++ b/config/zellij/config.kdl @@ -1,4 +1,3 @@ -copy_clipboard "system" copy_command "xclip -selection clipboard" copy_on_select true theme "catppuccin-mocha" diff --git a/config/zellij/layouts/admin.kdl b/config/zellij/layouts/admin.kdl index e3cb724..5719f30 100644 --- a/config/zellij/layouts/admin.kdl +++ b/config/zellij/layouts/admin.kdl @@ -9,22 +9,22 @@ layout { } } tab name="nas [FreeBSD]" { - pane command="autossh" { + pane command="autossh" close_on_exit=true { args "-M 0" "jas@nas.headscale.moonshadow.dev" } } tab name="moonshadow [FreeBSD]" { - pane command="autossh" { + pane command="autossh" close_on_exit=true { args "-M 0" "jas@moonshadow.headscale.moonshadow.dev" } } tab name="hyperreal.coffee [Debian]" { - pane command="autossh" { + pane command="autossh" close_on_exit=true { args "-M 0" "jas@hyperreal.headscale.moonshadow.dev" } } tab name="rpi400 [Debian]" { - pane command="autossh" { + pane command="autossh" close_on_exit=true { args "-M 0" "root@rpi400.headscale.moonshadow.dev" } } diff --git a/config/zellij/layouts/home.kdl b/config/zellij/layouts/home.kdl index 66bb6f9..8963a0f 100644 --- a/config/zellij/layouts/home.kdl +++ b/config/zellij/layouts/home.kdl @@ -8,8 +8,11 @@ layout { plugin location="zellij:status-bar" } } + tab name="Files" { + pane command="yazi" close_on_exit=true + } tab name="tilde.team IRC" { - pane command="autossh" { + pane command="autossh" close_on_exit=true { args "-M 0" "hyperreal@tilde.team" } } diff --git a/config/zellij/layouts/monitoring.kdl b/config/zellij/layouts/monitoring.kdl index 449fc11..f115c87 100644 --- a/config/zellij/layouts/monitoring.kdl +++ b/config/zellij/layouts/monitoring.kdl @@ -9,27 +9,27 @@ layout { } } tab name="nas 100.64.0.13" { - pane command="autossh" { + pane command="autossh" close_on_exit=true { args "-M 0" "-tttt" "jas@nas.headscale.moonshadow.dev" "btop" } } tab name="moonshadow 100.64.0.8" { - pane command="autossh" { + pane command="autossh" close_on_exit=true { args "-M 0" "-tttt" "jas@moonshadow.headscale.moonshadow.dev" "btop" } } tab name="hyperreal.coffee 100.64.0.14" { - pane command="autossh" { + pane command="autossh" close_on_exit=true { args "-M 0" "-tttt" "jas@hyperreal.headscale.moonshadow.dev" "btop" } } tab name="rpi400 100.64.0.5" { - pane command="autossh" { + pane command="autossh" close_on_exit=true { args "-M 0" "-tttt" "root@rpi400.headscale.moonshadow.dev" "btop" } } tab name="glances" { - pane command="/home/jas/bin/swivel" { + pane command="/home/jas/bin/swivel" close_on_exit=true { args "100.64.0.13" "100.64.0.8" "100.64.0.14" "100.64.0.5" } } diff --git a/doom/.doom.d/config.el b/doom/.doom.d/config.el index 8402fbf..9922a61 100644 --- a/doom/.doom.d/config.el +++ b/doom/.doom.d/config.el @@ -18,7 +18,7 @@ ;; Set fonts (setq fontsize 28) -(setq monofontfam "GeistMono Nerd Font Mono") +(setq monofontfam "GeistMono Nerd Font Propo") (setq doom-font (font-spec :family monofontfam :size fontsize) doom-variable-pitch-font (font-spec :family monofontfam :size fontsize) doom-symbol-font (font-spec :family monofontfam :size fontsize) diff --git a/just/.justfile b/just/.justfile index 48b4b51..b0096dd 100644 --- a/just/.justfile +++ b/just/.justfile @@ -22,15 +22,34 @@ link-dotfiles: ln -sf {{dotfiles_repo}}/config/xfce4-laptop {{configdir}}/xfce4 fi + rm -fv {{homedir}}/.justfile ln -sf {{dotfiles_repo}}/just/.justfile {{homedir}}/.justfile + + rm -rfv {{homedir}}/.doom.d ln -sf {{dotfiles_repo}}/doom/.doom.d {{homedir}}/.doom.d + + rm -fv {{homedir}}/.zshrc ln -sf {{dotfiles_repo}}/zsh/.zshrc {{homedir}}/.zshrc + + rm -rfv {{homedir}}/.zshrc.d ln -sf {{dotfiles_repo}}/zsh/.zshrc.d {{homedir}}/.zshrc.d + + rm -rfv {{configdir}}/bat ln -sf {{dotfiles_repo}}/config/bat {{configdir}}/bat + + rm -rfv {{configdir}}/git ln -sf {{dotfiles_repo}}/config/git {{configdir}}/git + + rm -rfv {{configdir}}/newsboat ln -sf {{dotfiles_repo}}/config/newsboat {{configdir}}/newsboat + + rm -rfv {{configdir}}/rofi ln -sf {{dotfiles_repo}}/config/rofi {{configdir}}/rofi + + rm -fv {{configdir}}/starship.toml ln -sf {{dotfiles_repo}}/config/starship.toml {{configdir}}/starship.toml + + rm -rfv {{configdir}}/zellij ln -sf {{dotfiles_repo}}/config/zellij {{configdir}}/zellij clean-dotfiles: @@ -47,8 +66,8 @@ clean-dotfiles: rm -rfv {{configdir}}/zellij dl-catppuccin-xfce4-term: - mkdir -p {{homedir}}/.local/share/xfce4/terminal/colorschemes - wget https://raw.githubusercontent.com/catppuccin/xfce4-terminal/refs/heads/main/themes/catppuccin-mocha.theme -O {{homedir}}/.local/share/xfce4/terminal/colorschemes/catppuccin-mocha.theme + mkdir -p {{localshare}}/xfce4/terminal/colorschemes + wget https://files.hyperreal.coffee/catppuccin-mocha.theme -O {{localshare}}/xfce4/terminal/colorschemes/catppuccin-mocha.theme homebrew-progs: #!/usr/bin/env bash @@ -89,7 +108,9 @@ python-tools: pipx inject bpython qbittorrent-api webdev-tools: + sudo npm install -g @bitwarden/cli sudo npm install -g @catppuccin/inkcat + sudo npm install -g doctoc sudo npm install -g prettier sudo npm install -g js-beautify sudo npm install -g stylelint