diff --git a/.bashrc b/.bashrc new file mode 100644 index 0000000..43049e4 --- /dev/null +++ b/.bashrc @@ -0,0 +1,20 @@ +# If not running interactively, don't do anything (leave this at the top of this file) +[[ $- != *i* ]] && return + +# All the default Omarchy aliases and functions +# (don't mess with these directly, just overwrite them here!) +source ~/.local/share/omarchy/default/bash/rc + +# Add your own exports, aliases, and functions here. +# +# Make an alias for invoking commands you use constantly +# alias p='python' +. "$HOME/.cargo/env" + +. "$HOME/.local/share/../bin/env" +alias zed='zeditor' +alias la='ls -la' + + + +fastfetch diff --git a/git/gitconfig b/.gitconfig similarity index 82% rename from git/gitconfig rename to .gitconfig index 1a1e5bd..5fc521d 100644 --- a/git/gitconfig +++ b/.gitconfig @@ -47,7 +47,6 @@ autoSetupRemote = true # easier to push new branches default = current # push only current branch by default followTags = true # push also tags - gpgSign = false # my remotes doesn't support sign pushes [pull] rebase = true @@ -75,28 +74,13 @@ context = white whitespace = yellow reverse -[interactive] - diffFilter = diff-so-fancy --patch - singlekey = true - -# Third-party: diff-so-fancy -[diff-so-fancy] - markEmptyLines = false - # URL shortcuts [url "git@github.com:"] insteadOf = "gh:" [url "git@github.com:Jake-Pullen/"] insteadOf = "JP:" -[maintenance] - repo = /home/devin/dotfiles [fetch] prune = true -[filter "lfs"] - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true - clean = git-lfs clean -- %f [safe] directory = /mnt/nas/hosted_git/DnD.git directory = /mnt/nas/hosted_git/dungeon_masters_vault.git diff --git a/omarchy_start.sh b/omarchy_package_install.sh similarity index 95% rename from omarchy_start.sh rename to omarchy_package_install.sh index 55ea0ab..2a94fac 100644 --- a/omarchy_start.sh +++ b/omarchy_package_install.sh @@ -3,6 +3,7 @@ pacman_to_add=( "tree" "ttf-fira-code" + "cronie" ) aur_to_add=( diff --git a/restore_cron_jobs.sh b/restore_cron_jobs.sh new file mode 100644 index 0000000..188f03c --- /dev/null +++ b/restore_cron_jobs.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# + +# Copy cron tasks to /usr/local/bin +cp /mnt/nas/Jake/cron_tasks/*.sh /usr/local/bin/ + +# Restore from your saved file +crontab < /mnt/nas/Jake/cron_tasks/cron_backup diff --git a/setup_omarchy.sh b/setup_omarchy.sh index fbca96c..15f5920 100755 --- a/setup_omarchy.sh +++ b/setup_omarchy.sh @@ -11,7 +11,8 @@ echo "========================================" # 1. Add packages (must be first) echo "[1/4] Installing packages..." -./omarchy_start.sh +./omarchy_package_install.sh + # 2. Set up symbolic links echo "" @@ -33,6 +34,12 @@ echo " - Restoring SSH and GPG keys..." echo " - Restoring Git backups..." ./restore_git_backup.sh +echo " - Restoring cron jobs..." +./restore_cron_jobs.sh + +echo " - Enabling services..." +sudo systemctl enable --now cronie.service + echo "" echo "========================================" echo " Omarchy Setup Complete!"