This commit is contained in:
Jeffrey Serio 2024-12-22 09:24:58 -06:00
parent aa9c91ed04
commit cca3e2f48b
6 changed files with 30 additions and 74 deletions

View File

@ -9,11 +9,11 @@ configuration{
location: 0; location: 0;
disable-history: false; disable-history: false;
hide-scrollbar: true; hide-scrollbar: true;
display-drun: " Apps "; display-drun: " 󰀻 Apps ";
display-run: " Run "; display-run: " > Run ";
display-window: " 🗔 Windows "; display-window: " Windows ";
display-Network: " 󰤨 Network "; display-Network: " 󰤨 Network ";
display-filebrowser: " 📁 Files "; display-filebrowser: " 󰪶 Files ";
sidebar-mode: true; sidebar-mode: true;
} }
@ -25,8 +25,8 @@ element-text, element-icon , mode-switcher {
} }
window { window {
height: 800px; height: 600px;
width: 1200px; width: 600px;
border: 3px; border: 3px;
border-color: @border-col; border-color: @border-col;
background-color: @bg-col; background-color: @bg-col;
@ -67,7 +67,7 @@ listview {
border: 0px 0px 0px; border: 0px 0px 0px;
padding: 3px 0px 0px; padding: 3px 0px 0px;
margin: 10px 0px 0px 20px; margin: 10px 0px 0px 20px;
columns: 2; columns: 1;
background-color: @bg-col; background-color: @bg-col;
} }

View File

@ -1,5 +1,5 @@
copy_clipboard "system" copy_clipboard "system"
copy_command "wl-copy" copy_command "xclip -selection clipboard"
copy_on_select true copy_on_select true
theme "catppuccin-mocha" theme "catppuccin-mocha"
themes { themes {

View File

@ -29,6 +29,7 @@ apt_packages=(
jq jq
lsd lsd
lynx lynx
maim
neovim neovim
nmap nmap
nodejs nodejs
@ -41,6 +42,7 @@ apt_packages=(
python3-pip python3-pip
python3-poetry python3-poetry
ripgrep ripgrep
rofi
rsync rsync
rsyslog rsyslog
shfmt shfmt
@ -52,8 +54,7 @@ apt_packages=(
w3m w3m
wget wget
wireshark wireshark
wl-clipboard xclip
xfce4-terminal
zip zip
zsh zsh
) )
@ -77,6 +78,7 @@ dnf_packages=(
eza eza
fastfetch fastfetch
fd-find fd-find
flatpak
fzf fzf
git git
git-core git-core
@ -87,15 +89,13 @@ dnf_packages=(
jc jc
jq jq
just just
kbackup
kpeoplevcard
lagrange lagrange
ldns ldns
libtool libtool
lsd lsd
lsof lsof
lynx lynx
neochat maim
neovim neovim
nmap nmap
node-exporter node-exporter
@ -108,19 +108,21 @@ dnf_packages=(
python3-pip python3-pip
qbittorrent qbittorrent
ripgrep ripgrep
rofi
rsync rsync
rsyslog rsyslog
shfmt shfmt
ShellCheck ShellCheck
tcpdump tcpdump
tealdeer tealdeer
tokodon
trash-cli trash-cli
vlc vlc
w3m w3m
wireshark wireshark
wl-clipboard xclip
yakuake xfce4-docklike-plugin
xfce4-genmon-plugin
xfce4-weather-plugin
zsh zsh
) )
@ -134,6 +136,7 @@ copr_repos=(
flatpak_packages=( flatpak_packages=(
com.discordapp.Discord com.discordapp.Discord
com.github.tchx84.Flatseal com.github.tchx84.Flatseal
im.riot.Riot
io.podman_desktop.PodmanDesktop io.podman_desktop.PodmanDesktop
) )
@ -152,7 +155,7 @@ services_enable=(
firewalld.service firewalld.service
prometheus-node-exporter.service prometheus-node-exporter.service
rsyslog.service rsyslog.service
systemd-networkd systemd-networkd.service
tailscaled.service tailscaled.service
) )
@ -248,7 +251,7 @@ function install_charm_packages() {
if test -f /etc/debian_version; then if test -f /etc/debian_version; then
curl -s https://api.github.com/repos/charmbracelet/gum/releases/latest | grep "browser_download_url.*deb" | grep "$(dpkg --print-architecture)" | cut -d : -f 2,3 | tr -d '"' | wget -qi - curl -s https://api.github.com/repos/charmbracelet/gum/releases/latest | grep "browser_download_url.*deb" | grep "$(dpkg --print-architecture)" | cut -d : -f 2,3 | tr -d '"' | wget -qi -
curl -s https://api.github.com/repos/charmbracelet/gum/releases/latest | grep "browser_download_url" | grep "checksums.txt" | head -n 1 | cut -d : -f 2,3 | tr -d '"' | wget -qi - curl -s https://api.github.com/repos/charmbracelet/gum/releases/latest | grep "browser_download_url" | grep "checksums.txt" | head -n 1 | cut -d : -f 2,3 | tr -d '"' | wget -qi -
if [ $(grep "$(dpkg --print-architecture).deb" checksums.txt | sha256sum -c | head -n 1 | awk '{print $2}') = "OK" ]; then if [ "$(grep $(dpkg --print-architecture).deb checksums.txt | sha256sum -c | head -n 1 | awk '{print $2}')" = "OK" ]; then
sudo dpkg -i gum*.deb sudo dpkg -i gum*.deb
sudo apt -f install sudo apt -f install
fi fi
@ -257,12 +260,7 @@ function install_charm_packages() {
fi fi
if test -f /etc/redhat-release; then if test -f /etc/redhat-release; then
echo '[charm] printf "[charm]\nname=Charm\nbaseurl=https://repo.charm.sh/yum/\nenabled=1\ngpgcheck=1\ngpgkey=https://repo.charm.sh/yum/gpg.key\n" | sudo tee /etc/yum.repos.d/charm.repo
name=Charm
baseurl=https://repo.charm.sh/yum/
enabled=1
gpgcheck=1
gpgkey=https://repo.charm.sh/yum/gpg.key' | sudo tee /etc/yum.repos.d/charm.repo
sudo rpm --import https://repo.charm.sh/yum/gpg.key sudo rpm --import https://repo.charm.sh/yum/gpg.key
sudo dnf install -y gum charm sudo dnf install -y gum charm
fi fi
@ -270,6 +268,7 @@ function install_charm_packages() {
function install_tailscale() { function install_tailscale() {
action_label "INSTALLING TAILSCALE" action_label "INSTALLING TAILSCALE"
sudo rm -v /etc/yum.repos.d/tailscale.repo
curl -fsSL https://tailscale.com/install.sh | sh curl -fsSL https://tailscale.com/install.sh | sh
} }
@ -316,8 +315,8 @@ function setup_resolv_conf() {
# Depends: enable_tailscale # Depends: enable_tailscale
function setup_rsyslog_conf() { function setup_rsyslog_conf() {
action_label "SETTING UP RSYSLOG" action_label "SETTING UP RSYSLOG"
echo '# Forward to main monitoring node (nas.lyrebird-marlin.ts.net) echo '# Forward to main monitoring node (nas-aux.lyrebird-marlin.ts.net)
*.* action(type="omfwd" target="100.112.241.12" port="514" protocol="tcp" *.* action(type="omfwd" target="100.86.148.42" port="514" protocol="tcp"
action.resumeRetryCount="100" action.resumeRetryCount="100"
queue.type="linkedList" queue.size="10000")' | sudo tee /etc/rsyslog.d/00forward-to-nas.conf queue.type="linkedList" queue.size="10000")' | sudo tee /etc/rsyslog.d/00forward-to-nas.conf
} }
@ -366,46 +365,6 @@ function disable_ipv6() {
fi fi
} }
function setup_fstab() {
action_label "SETTING UP /etc/fstab"
if test -f /etc/redhat-release; then
sudo mkdir -p /mnt/borgbackup /mnt/quick-backup
if ! grep "ecf44876-2e4e-46ad-9f12-fc516c8ace2d" /etc/fstab; then
echo "UUID=ecf44876-2e4e-46ad-9f12-fc516c8ace2d /mnt/borgbackup btrfs defaults,subvol=@borgbackup,compress=zstd:1,x-systemd.device-timeout=20 0 0" | sudo tee -a /etc/fstab
echo "UUID=ecf44876-2e4e-46ad-9f12-fc516c8ace2d /mnt/quick-backup btrfs defaults,subvol=@quick-backup,compress=zstd:1,x-systemd.device-timeout=20 0 0" | sudo tee -a /etc/fstab
else
echo "/etc/fstab already configured."
fi
sudo systemctl daemon-reload
sudo restorecon -Rv /mnt/borgbackup
sudo restorecon -Rv /mnt/quick-backup
sudo mount -av
fi
}
# Depends:
# - install_packages
# - setup_fstab
function setup_borgmatic_config() {
action_label "SETTING UP BORGMATIC CONFIG"
if test -f /etc/redhat-release; then
sudo mkdir -p /etc/borgmatic
sudo cp -v /mnt/quick-backup/borgmatic-config.yaml /etc/borgmatic/config.yaml
fi
}
# Depends:
# - install_packages
# - setup_fstab
function copy_quick_backup() {
action_label "COPYING QUICK BACKUP"
if test -f /etc/redhat-release; then
rsync -aAXPz /mnt/quick-backup/jas/ /home/jas
fi
}
# Depends: copy_quick_backup
function build_bat_cache() { function build_bat_cache() {
action_label "BUILDING BAT CACHE" action_label "BUILDING BAT CACHE"
if test -f /etc/debian_version; then if test -f /etc/debian_version; then
@ -455,9 +414,6 @@ if test -f /etc/redhat-release; then
enable_flathub enable_flathub
install_flatpaks install_flatpaks
setup_networkd_conf setup_networkd_conf
setup_fstab
setup_borgmatic_config
copy_quick_backup
fi fi
install_pipx_packages install_pipx_packages

View File

@ -23,9 +23,9 @@ deploy-dotfiles:
cp -fv {{dotfiles_repo}}/zsh/.zshenv {{homedir}} cp -fv {{dotfiles_repo}}/zsh/.zshenv {{homedir}}
cp -rfv {{dotfiles_repo}}/config/.config/bat {{configdir}} cp -rfv {{dotfiles_repo}}/config/.config/bat {{configdir}}
cp -rfv {{dotfiles_repo}}/config/.config/git {{configdir}} cp -rfv {{dotfiles_repo}}/config/.config/git {{configdir}}
cp -rfv {{dotfiles_repo}}/config/.config/rofi {{configdir}}
cp -fv {{dotfiles_repo}}/config/.config/starship.toml {{configdir}} cp -fv {{dotfiles_repo}}/config/.config/starship.toml {{configdir}}
cp -rfv {{dotfiles_repo}}/config/.config/zellij {{configdir}} cp -rfv {{dotfiles_repo}}/config/.config/zellij {{configdir}}
cp -rfv {{dotfiles_repo}}/config/.config/systemd {{configdir}}
save-dotfiles: save-dotfiles:
cp -fv {{homedir}}/.justfile {{dotfiles_repo}}/just/ cp -fv {{homedir}}/.justfile {{dotfiles_repo}}/just/
@ -35,9 +35,9 @@ save-dotfiles:
cp -fv {{homedir}}/.zshenv {{dotfiles_repo}}/zsh/ cp -fv {{homedir}}/.zshenv {{dotfiles_repo}}/zsh/
cp -rfv {{configdir}}/bat {{dotfiles_repo}}/config/.config/ cp -rfv {{configdir}}/bat {{dotfiles_repo}}/config/.config/
cp -rfv {{configdir}}/git {{dotfiles_repo}}/config/.config/ cp -rfv {{configdir}}/git {{dotfiles_repo}}/config/.config/
cp -rfv {{configdir}}/rofi {{dotfiles_repo}}/config/.config/
cp -fv {{configdir}}/starship.toml {{dotfiles_repo}}/config/.config/ cp -fv {{configdir}}/starship.toml {{dotfiles_repo}}/config/.config/
cp -rfv {{configdir}}/zellij {{dotfiles_repo}}/config/.config/ cp -rfv {{configdir}}/zellij {{dotfiles_repo}}/config/.config/
cp -rfv {{configdir}}/systemd {{dotfiles_repo}}/config/.config/
clean-dotfiles: clean-dotfiles:
rm -fv {{homedir}}/.justfile rm -fv {{homedir}}/.justfile
@ -47,9 +47,9 @@ clean-dotfiles:
rm -fv {{homedir}}/.zshenv rm -fv {{homedir}}/.zshenv
rm -rfv {{configdir}}/bat rm -rfv {{configdir}}/bat
rm -rfv {{configdir}}/git rm -rfv {{configdir}}/git
rm -rfv {{configdir}}/rofi
rm -fv {{configdir}}/starship.toml rm -fv {{configdir}}/starship.toml
rm -rfv {{configdir}}/zellij rm -rfv {{configdir}}/zellij
rm -rfv {{configdir}}/systemd
install-dust: install-dust:
#!/usr/bin/env bash #!/usr/bin/env bash

View File

@ -62,7 +62,7 @@ alias -g G='| grep'
alias -g L='| less -FRX' alias -g L='| less -FRX'
alias -g B='| bat' alias -g B='| bat'
alias -g J='| jq' alias -g J='| jq'
alias -g CC='| wl-copy' alias -g CC='| xclip -selection clipboard'
alias -g C='| wc -l' alias -g C='| wc -l'
# Get public IP address # Get public IP address

View File

@ -66,7 +66,7 @@ function trsh() {
# Copy SSH public key to clipboard (requires wl-copy) # Copy SSH public key to clipboard (requires wl-copy)
function pubkey() { 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" echo "--> SSH public key copied to clipboard"
} }